Merge branch 'release-0.10.0'
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.classpath b/org.agilemore.agilegrid/.classpath
similarity index 80%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/.classpath
copy to org.agilemore.agilegrid/.classpath
index 304e861..f2d4146 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.classpath
+++ b/org.agilemore.agilegrid/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path=""/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.agilemore.agilegrid/.gitignore b/org.agilemore.agilegrid/.gitignore
new file mode 100644
index 0000000..ea8c4bf
--- /dev/null
+++ b/org.agilemore.agilegrid/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.project b/org.agilemore.agilegrid/.project
similarity index 90%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/.project
copy to org.agilemore.agilegrid/.project
index 0032b4b..7adff92 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.project
+++ b/org.agilemore.agilegrid/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.rmf.reqif10.pror.presentation.id.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.agilemore.agilegrid</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.agilemore.agilegrid/.settings/org.eclipse.jdt.core.prefs b/org.agilemore.agilegrid/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..c537b63
--- /dev/null
+++ b/org.agilemore.agilegrid/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.agilemore.agilegrid/META-INF/MANIFEST.MF b/org.agilemore.agilegrid/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..a1c61b4
--- /dev/null
+++ b/org.agilemore.agilegrid/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.agilemore.agilegrid
+Bundle-Version: 1.3.3.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Localization: plugin
+Export-Package: icons,
+ org.agilemore.agilegrid,
+ org.agilemore.agilegrid.editors,
+ org.agilemore.agilegrid.renderers
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui
+Bundle-Vendor: %providerName
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html b/org.agilemore.agilegrid/about.html
similarity index 63%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
copy to org.agilemore.agilegrid/about.html
index f47dbdd..6e49765 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
+++ b/org.agilemore.agilegrid/about.html
@@ -1,28 +1,40 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+<h3>Third Party Content</h3>
+
+The Content includes items that have been sourced from third parties as set out below. If you did not receive this Content directly from the Eclipse Foundation, the following is provided for informational purposes only, and you should look to the Redistributor's license for terms and conditions of use.
+
+<h4>Agile Grid version 1.3.3</h4>
+
+<p>The plug-in includes software developed by the <a href="http://agilegrid.sourceforge.net">Agile Grid Project</a> ("Agile Grid") at SourceForge.net.</p>
+
+<p>Your use of Agile Grid is governed by the terms and conditions of the <a href="epl-v10.html">EPL</a>.</p>
+
+<p>The Agile Grid source code can be downloaded from the <a href="http://sourceforge.net/p/agilegrid/git/ci/RMF/tree/">Agile Grid Git repository on SourceForge.net</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.agilemore.agilegrid/build.properties b/org.agilemore.agilegrid/build.properties
new file mode 100644
index 0000000..ac91349
--- /dev/null
+++ b/org.agilemore.agilegrid/build.properties
@@ -0,0 +1,9 @@
+bin.includes = META-INF/,\
+               .,\
+               org/,\
+               icons/,\
+               plugin.properties,\
+               about.html,\
+               epl-v10.html,\
+               notice.html
+output.. = /
diff --git a/org.eclipse.rmf.examples.feature/epl-v10.html b/org.agilemore.agilegrid/epl-v10.html
similarity index 98%
copy from org.eclipse.rmf.examples.feature/epl-v10.html
copy to org.agilemore.agilegrid/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.examples.feature/epl-v10.html
+++ b/org.agilemore.agilegrid/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.agilemore.agilegrid/icons/arrow_down.png b/org.agilemore.agilegrid/icons/arrow_down.png
new file mode 100644
index 0000000..f0735bd
--- /dev/null
+++ b/org.agilemore.agilegrid/icons/arrow_down.png
Binary files differ
diff --git a/org.agilemore.agilegrid/icons/arrow_up.png b/org.agilemore.agilegrid/icons/arrow_up.png
new file mode 100644
index 0000000..0849e71
--- /dev/null
+++ b/org.agilemore.agilegrid/icons/arrow_up.png
Binary files differ
diff --git a/org.agilemore.agilegrid/icons/checkbox-source.xcf b/org.agilemore.agilegrid/icons/checkbox-source.xcf
new file mode 100644
index 0000000..80ba0ab
--- /dev/null
+++ b/org.agilemore.agilegrid/icons/checkbox-source.xcf
Binary files differ
diff --git a/org.agilemore.agilegrid/icons/checked.png b/org.agilemore.agilegrid/icons/checked.png
new file mode 100644
index 0000000..a48f5ee
--- /dev/null
+++ b/org.agilemore.agilegrid/icons/checked.png
Binary files differ
diff --git a/org.agilemore.agilegrid/icons/unchecked.png b/org.agilemore.agilegrid/icons/unchecked.png
new file mode 100644
index 0000000..411cae8
--- /dev/null
+++ b/org.agilemore.agilegrid/icons/unchecked.png
Binary files differ
diff --git a/org.agilemore.agilegrid/icons/unchecked_clicked.png b/org.agilemore.agilegrid/icons/unchecked_clicked.png
new file mode 100644
index 0000000..0de28fc
--- /dev/null
+++ b/org.agilemore.agilegrid/icons/unchecked_clicked.png
Binary files differ
diff --git a/org.eclipse.rmf.examples.feature/license.html b/org.agilemore.agilegrid/notice.html
similarity index 96%
rename from org.eclipse.rmf.examples.feature/license.html
rename to org.agilemore.agilegrid/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.examples.feature/license.html
+++ b/org.agilemore.agilegrid/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AbstractCellEditorProvider$1.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AbstractCellEditorProvider$1.class
new file mode 100644
index 0000000..29f8105
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AbstractCellEditorProvider$1.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AbstractCellEditorProvider.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AbstractCellEditorProvider.class
new file mode 100644
index 0000000..1c007a1
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AbstractCellEditorProvider.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AbstractContentProvider.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AbstractContentProvider.class
new file mode 100644
index 0000000..2bba18e
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AbstractContentProvider.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AbstractLayoutAdvisor.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AbstractLayoutAdvisor.class
new file mode 100644
index 0000000..16de8d7
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AbstractLayoutAdvisor.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$1.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$1.class
new file mode 100644
index 0000000..be7e77c
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$1.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$10.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$10.class
new file mode 100644
index 0000000..b6042ad
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$10.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$2.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$2.class
new file mode 100644
index 0000000..9cbfbf3
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$2.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$3.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$3.class
new file mode 100644
index 0000000..e596002
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$3.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$4.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$4.class
new file mode 100644
index 0000000..70e3c63
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$4.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$5.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$5.class
new file mode 100644
index 0000000..5bc18c1
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$5.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$6.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$6.class
new file mode 100644
index 0000000..5d4264e
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$6.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$7.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$7.class
new file mode 100644
index 0000000..8501d4a
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$7.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$8.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$8.class
new file mode 100644
index 0000000..050d156
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$8.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$9.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$9.class
new file mode 100644
index 0000000..02f7111
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$9.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$TooltipListener$1.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$TooltipListener$1.class
new file mode 100644
index 0000000..b3c2260
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$TooltipListener$1.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$TooltipListener.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$TooltipListener.class
new file mode 100644
index 0000000..5bbfa82
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid$TooltipListener.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid.class
new file mode 100644
index 0000000..4c51d5e
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGrid.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$1.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$1.class
new file mode 100644
index 0000000..7467ad6
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$1.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$2.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$2.class
new file mode 100644
index 0000000..50382cd
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$2.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$3.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$3.class
new file mode 100644
index 0000000..ae6f4c7
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$3.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$CopyAction.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$CopyAction.class
new file mode 100644
index 0000000..9d15350
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$CopyAction.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$CopyAllAction.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$CopyAllAction.class
new file mode 100644
index 0000000..a356303
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$CopyAllAction.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$CutAction.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$CutAction.class
new file mode 100644
index 0000000..1d2e002
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$CutAction.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$PasteAction.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$PasteAction.class
new file mode 100644
index 0000000..07ac06f
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$PasteAction.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$SelectAllAction.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$SelectAllAction.class
new file mode 100644
index 0000000..312c638
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler$SelectAllAction.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler.class
new file mode 100644
index 0000000..7c63ed5
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridActionHandler.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridEditor$1.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridEditor$1.class
new file mode 100644
index 0000000..acd4189
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridEditor$1.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridEditor$2.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridEditor$2.class
new file mode 100644
index 0000000..4a3caae
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridEditor$2.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridEditor$3.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridEditor$3.class
new file mode 100644
index 0000000..5a791ba
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridEditor$3.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridEditor$4.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridEditor$4.class
new file mode 100644
index 0000000..4e81304
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridEditor$4.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridEditor.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridEditor.class
new file mode 100644
index 0000000..eef082a
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/AgileGridEditor.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/Assert.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/Assert.class
new file mode 100644
index 0000000..cbc9193
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/Assert.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/Cell.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/Cell.class
new file mode 100644
index 0000000..3667378
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/Cell.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/CellColumn.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellColumn.class
new file mode 100644
index 0000000..001bf63
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellColumn.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/CellDoubleClickEvent.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellDoubleClickEvent.class
new file mode 100644
index 0000000..dc801ef
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellDoubleClickEvent.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/CellEditor$1.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellEditor$1.class
new file mode 100644
index 0000000..6ec7d24
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellEditor$1.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/CellEditor$2.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellEditor$2.class
new file mode 100644
index 0000000..5713dd0
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellEditor$2.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/CellEditor$3.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellEditor$3.class
new file mode 100644
index 0000000..e7a95e7
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellEditor$3.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/CellEditor$LayoutData.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellEditor$LayoutData.class
new file mode 100644
index 0000000..2b1a790
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellEditor$LayoutData.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/CellEditor.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellEditor.class
new file mode 100644
index 0000000..863416d
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellEditor.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/CellNavigationStrategy.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellNavigationStrategy.class
new file mode 100644
index 0000000..0b10194
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellNavigationStrategy.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/CellResizeAdapter.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellResizeAdapter.class
new file mode 100644
index 0000000..d9e3a48
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellResizeAdapter.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/CellRow.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellRow.class
new file mode 100644
index 0000000..5a3cc72
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellRow.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/CellSelectionManager$1.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellSelectionManager$1.class
new file mode 100644
index 0000000..12b20c2
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellSelectionManager$1.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/CellSelectionManager$2.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellSelectionManager$2.class
new file mode 100644
index 0000000..fe6042e
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellSelectionManager$2.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/CellSelectionManager$3.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellSelectionManager$3.class
new file mode 100644
index 0000000..1968e7a
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellSelectionManager$3.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/CellSelectionManager.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellSelectionManager.class
new file mode 100644
index 0000000..a4a4c3b
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/CellSelectionManager.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/ColumnSortComparator.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/ColumnSortComparator.class
new file mode 100644
index 0000000..f185669
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/ColumnSortComparator.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/ColumnSortOnClick.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/ColumnSortOnClick.class
new file mode 100644
index 0000000..31b1077
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/ColumnSortOnClick.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/DefaultCellEditorProvider.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/DefaultCellEditorProvider.class
new file mode 100644
index 0000000..af70ea0
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/DefaultCellEditorProvider.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/DefaultCellRendererProvider.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/DefaultCellRendererProvider.class
new file mode 100644
index 0000000..e059f96
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/DefaultCellRendererProvider.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/DefaultCompositorStrategy.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/DefaultCompositorStrategy.class
new file mode 100644
index 0000000..0531f7b
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/DefaultCompositorStrategy.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/DefaultContentProvider.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/DefaultContentProvider.class
new file mode 100644
index 0000000..955e75e
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/DefaultContentProvider.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/DefaultLayoutAdvisor.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/DefaultLayoutAdvisor.class
new file mode 100644
index 0000000..1c16ddb
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/DefaultLayoutAdvisor.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/EditorActivationAdapter.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/EditorActivationAdapter.class
new file mode 100644
index 0000000..a6b2c33
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/EditorActivationAdapter.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/EditorActivationEvent.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/EditorActivationEvent.class
new file mode 100644
index 0000000..2847cc8
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/EditorActivationEvent.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/EditorActivationStrategy$1.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/EditorActivationStrategy$1.class
new file mode 100644
index 0000000..7c9ea89
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/EditorActivationStrategy$1.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/EditorActivationStrategy.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/EditorActivationStrategy.class
new file mode 100644
index 0000000..c920271
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/EditorActivationStrategy.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/EditorDeactivationEvent.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/EditorDeactivationEvent.class
new file mode 100644
index 0000000..4840dfb
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/EditorDeactivationEvent.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/FocusCellChangedEvent.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/FocusCellChangedEvent.class
new file mode 100644
index 0000000..ebf9e4a
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/FocusCellChangedEvent.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellDoubleClickListener.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellDoubleClickListener.class
new file mode 100644
index 0000000..7341677
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellDoubleClickListener.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellEditorListener.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellEditorListener.class
new file mode 100644
index 0000000..372af69
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellEditorListener.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellEditorProvider.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellEditorProvider.class
new file mode 100644
index 0000000..63e45c7
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellEditorProvider.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellEditorValidator.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellEditorValidator.class
new file mode 100644
index 0000000..5d7e3a1
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellEditorValidator.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellNavigationStrategy.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellNavigationStrategy.class
new file mode 100644
index 0000000..6675453
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellNavigationStrategy.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellRenderer.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellRenderer.class
new file mode 100644
index 0000000..71486de
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellRenderer.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellRendererProvider.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellRendererProvider.class
new file mode 100644
index 0000000..7792906
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellRendererProvider.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellResizeListener.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellResizeListener.class
new file mode 100644
index 0000000..cdc7f90
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICellResizeListener.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/ICompositorStrategy.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICompositorStrategy.class
new file mode 100644
index 0000000..816f892
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/ICompositorStrategy.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/IContentProvider.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/IContentProvider.class
new file mode 100644
index 0000000..0159e25
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/IContentProvider.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/IEditorActivationListener.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/IEditorActivationListener.class
new file mode 100644
index 0000000..7a7a582
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/IEditorActivationListener.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/IFocusCellChangedListener.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/IFocusCellChangedListener.class
new file mode 100644
index 0000000..9c71679
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/IFocusCellChangedListener.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/ILayoutAdvisor.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/ILayoutAdvisor.class
new file mode 100644
index 0000000..d421349
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/ILayoutAdvisor.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/ISelectionChangedListener.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/ISelectionChangedListener.class
new file mode 100644
index 0000000..8e2d50b
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/ISelectionChangedListener.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/Logging.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/Logging.class
new file mode 100644
index 0000000..0e68071
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/Logging.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/SWTResourceManager$1.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/SWTResourceManager$1.class
new file mode 100644
index 0000000..b1617a3
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/SWTResourceManager$1.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/SWTResourceManager.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/SWTResourceManager.class
new file mode 100644
index 0000000..0dc8433
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/SWTResourceManager.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/SWTX.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/SWTX.class
new file mode 100644
index 0000000..a4fc8a5
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/SWTX.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/ScalableColumnLayoutAdvisor.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/ScalableColumnLayoutAdvisor.class
new file mode 100644
index 0000000..eeccdd4
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/ScalableColumnLayoutAdvisor.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/SelectionChangedEvent.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/SelectionChangedEvent.class
new file mode 100644
index 0000000..4dee99f
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/SelectionChangedEvent.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/CheckboxCellEditor.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/CheckboxCellEditor.class
new file mode 100644
index 0000000..be62cf9
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/CheckboxCellEditor.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/ColorCellEditor$ColorCellLayout.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/ColorCellEditor$ColorCellLayout.class
new file mode 100644
index 0000000..46ff2df
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/ColorCellEditor$ColorCellLayout.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/ColorCellEditor.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/ColorCellEditor.class
new file mode 100644
index 0000000..23f670d
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/ColorCellEditor.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/ComboBoxCellEditor$1.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/ComboBoxCellEditor$1.class
new file mode 100644
index 0000000..b753d95
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/ComboBoxCellEditor$1.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/ComboBoxCellEditor$2.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/ComboBoxCellEditor$2.class
new file mode 100644
index 0000000..514fe6b
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/ComboBoxCellEditor$2.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/ComboBoxCellEditor.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/ComboBoxCellEditor.class
new file mode 100644
index 0000000..ba2b158
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/ComboBoxCellEditor.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/DialogCellEditor$1.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/DialogCellEditor$1.class
new file mode 100644
index 0000000..5a278e2
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/DialogCellEditor$1.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/DialogCellEditor$2.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/DialogCellEditor$2.class
new file mode 100644
index 0000000..53414bd
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/DialogCellEditor$2.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/DialogCellEditor$3.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/DialogCellEditor$3.class
new file mode 100644
index 0000000..236145f
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/DialogCellEditor$3.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/DialogCellEditor$DialogCellLayout.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/DialogCellEditor$DialogCellLayout.class
new file mode 100644
index 0000000..42b35aa
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/DialogCellEditor$DialogCellLayout.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/DialogCellEditor.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/DialogCellEditor.class
new file mode 100644
index 0000000..ca48cc9
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/DialogCellEditor.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/PopupCellEditor$1.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/PopupCellEditor$1.class
new file mode 100644
index 0000000..a5f1136
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/PopupCellEditor$1.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/PopupCellEditor$2.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/PopupCellEditor$2.class
new file mode 100644
index 0000000..aac6f7b
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/PopupCellEditor$2.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/PopupCellEditor$3.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/PopupCellEditor$3.class
new file mode 100644
index 0000000..f0d325c
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/PopupCellEditor$3.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/PopupCellEditor.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/PopupCellEditor.class
new file mode 100644
index 0000000..b58db73
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/PopupCellEditor.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/TextCellEditor$1.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/TextCellEditor$1.class
new file mode 100644
index 0000000..1446c52
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/TextCellEditor$1.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/TextCellEditor$2.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/TextCellEditor$2.class
new file mode 100644
index 0000000..56e5351
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/TextCellEditor$2.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/TextCellEditor$3.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/TextCellEditor$3.class
new file mode 100644
index 0000000..d60ad29
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/TextCellEditor$3.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/TextCellEditor$4.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/TextCellEditor$4.class
new file mode 100644
index 0000000..594b607
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/TextCellEditor$4.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/TextCellEditor.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/TextCellEditor.class
new file mode 100644
index 0000000..c97c41b
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/editors/TextCellEditor.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/AbstractCellRenderer.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/AbstractCellRenderer.class
new file mode 100644
index 0000000..d9fad37
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/AbstractCellRenderer.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/BarDiagramCellRenderer.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/BarDiagramCellRenderer.class
new file mode 100644
index 0000000..c669824
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/BarDiagramCellRenderer.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/ButtonCellRenderer.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/ButtonCellRenderer.class
new file mode 100644
index 0000000..2d06c1b
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/ButtonCellRenderer.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/CheckboxCellRenderer.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/CheckboxCellRenderer.class
new file mode 100644
index 0000000..0ad2124
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/CheckboxCellRenderer.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/HeaderCellRenderer.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/HeaderCellRenderer.class
new file mode 100644
index 0000000..f25011e
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/HeaderCellRenderer.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/IPercentage.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/IPercentage.class
new file mode 100644
index 0000000..e192dc0
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/IPercentage.class
Binary files differ
diff --git a/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/TextCellRenderer.class b/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/TextCellRenderer.class
new file mode 100644
index 0000000..185b166
--- /dev/null
+++ b/org.agilemore.agilegrid/org/agilemore/agilegrid/renderers/TextCellRenderer.class
Binary files differ
diff --git a/org.agilemore.agilegrid/plugin.properties b/org.agilemore.agilegrid/plugin.properties
new file mode 100644
index 0000000..c42f65a
--- /dev/null
+++ b/org.agilemore.agilegrid/plugin.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
+
+pluginName = Agilemore Agilegrid for RMF
+providerName = Eclipse Modeling Project
diff --git a/org.agilemore.agilegrid/pom.xml b/org.agilemore.agilegrid/pom.xml
new file mode 100644
index 0000000..356d169
--- /dev/null
+++ b/org.agilemore.agilegrid/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ <copyright>
+Copyright (c) 2012 itemis AG.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+
+Contributors:
+    Mark Broerkens - initial API and implementation
+ </copyright>
+
+-->
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.rmf</groupId>
+		<artifactId>org.eclipse.rmf.releng</artifactId>
+		<version>0.10.0-SNAPSHOT</version>
+		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.agilemore.agilegrid</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	<groupId>org.agilemore.agilegrid</groupId>
+	<properties>
+    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  	</properties>
+	<version>1.3.3-SNAPSHOT</version>
+</project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.emf.ecore.converter/META-INF/MANIFEST.MF b/org.eclipse.rmf.emf.ecore.converter/META-INF/MANIFEST.MF
index c634ecb..ae50062 100644
--- a/org.eclipse.rmf.emf.ecore.converter/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.emf.ecore.converter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.emf.ecore.converter

-Bundle-Version: 0.9.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Bundle-ClassPath: .

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/org.eclipse.rmf.emf.ecore.converter/about.html b/org.eclipse.rmf.emf.ecore.converter/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.emf.ecore.converter/about.html
+++ b/org.eclipse.rmf.emf.ecore.converter/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.emf.ecore.converter/build.properties b/org.eclipse.rmf.emf.ecore.converter/build.properties
index 978b52c..33698a3 100644
--- a/org.eclipse.rmf.emf.ecore.converter/build.properties
+++ b/org.eclipse.rmf.emf.ecore.converter/build.properties
@@ -10,4 +10,7 @@
 output.. = bin/

 bin.includes = META-INF/,\

                .,\

-               plugin.properties

+               plugin.properties,\

+               about.html,\

+               epl-v10.html,\

+               notice.html

diff --git a/org.eclipse.rmf.emf.ecore.converter/epl-v10.html b/org.eclipse.rmf.emf.ecore.converter/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.emf.ecore.converter/epl-v10.html
+++ b/org.eclipse.rmf.emf.ecore.converter/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.emf.ecore.converter/notice.html b/org.eclipse.rmf.emf.ecore.converter/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.emf.ecore.converter/notice.html
+++ b/org.eclipse.rmf.emf.ecore.converter/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.emf.ecore.converter/pom.xml b/org.eclipse.rmf.emf.ecore.converter/pom.xml
index 9f65407..3276313 100644
--- a/org.eclipse.rmf.emf.ecore.converter/pom.xml
+++ b/org.eclipse.rmf.emf.ecore.converter/pom.xml
@@ -6,11 +6,10 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.emf.ecore.converter</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

@@ -21,7 +20,7 @@
 			<plugin>

 				<groupId>org.eclipse.tycho</groupId>

 				<artifactId>tycho-source-plugin</artifactId>

-				<version>${tycho-version}</version>

+				<version>${tycho.version}</version>

 				<executions>

 					<execution>

 						<id>plugin-source</id>

diff --git a/org.eclipse.rmf.examples.feature/about.properties b/org.eclipse.rmf.examples.feature/about.properties
deleted file mode 100644
index 124c0c2..0000000
--- a/org.eclipse.rmf.examples.feature/about.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-blurb=Copyright (c) 2013 itemis AG\n\

-All rights reserved. This program and the accompanying materials\n\

-are made available under the terms of the Eclipse Public License v1.0\n\

-which accompanies this distribution, and is available at\n\

-http://www.eclipse.org/legal/epl-v10.html\n\

-\n\

-Contributors:\n\

-    Mark Broerkens    - added dependencies to xerces XML parser \n\

-    
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/build.properties b/org.eclipse.rmf.examples.feature/build.properties
index de87c39..7b35999 100644
--- a/org.eclipse.rmf.examples.feature/build.properties
+++ b/org.eclipse.rmf.examples.feature/build.properties
@@ -1,6 +1,12 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               license.html,\
-               notice.html,\
-               about.properties
+               feature.properties
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/feature.properties b/org.eclipse.rmf.examples.feature/feature.properties
index 704ede0..399d71e 100644
--- a/org.eclipse.rmf.examples.feature/feature.properties
+++ b/org.eclipse.rmf.examples.feature/feature.properties
@@ -1,131 +1,32 @@
-# "licenseURL" property - URL of the "Feature License"

-# do not translate value - just change to point to a locale-specific HTML page

-licenseURL=license.html

+###############################################################################

+# Copyright (c) 2000, 2014 itemis AG and others.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+# 

+# Contributors:

+#     itemis AG - initial API and implementation

+###############################################################################

+# feature.properties

+# contains externalized strings for feature.xml

+# "%foo" in feature.xml corresponds to the key "foo" in this file

+# java.io.Properties file (ISO 8859-1 with "\\" escapes)

+# This file should be translated.

 

-# "license" property - text of the "Feature Update License"

-# should be plain text version of license agreement pointed to be "licenseURL"

-license=\

-Eclipse Foundation Software User Agreement\n\

-February 1, 2011\n\

-\n\

-Usage Of Content\n\

-\n\

-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\

-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\

-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\

-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\

-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\

-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\

-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\

-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\

-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\

-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\

-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\

-\n\

-Applicable Licenses\n\

-\n\

-Unless otherwise indicated, all Content made available by the\n\

-Eclipse Foundation is provided to you under the terms and conditions of\n\

-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\

-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\

-For purposes of the EPL, "Program" will mean the Content.\n\

-\n\

-Content includes, but is not limited to, source code, object code,\n\

-documentation and other files maintained in the Eclipse Foundation source code\n\

-repository ("Repository") in software modules ("Modules") and made available\n\

-as downloadable archives ("Downloads").\n\

-\n\

-       - Content may be structured and packaged into modules to facilitate delivering,\n\

-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\

-         plug-in fragments ("Fragments"), and features ("Features").\n\

-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\

-         in a directory named "plugins".\n\

-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\

-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\

-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\

-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\

-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\

-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\

-\n\

-The terms and conditions governing Plug-ins and Fragments should be\n\

-contained in files named "about.html" ("Abouts"). The terms and\n\

-conditions governing Features and Included Features should be contained\n\

-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\

-Licenses may be located in any directory of a Download or Module\n\

-including, but not limited to the following locations:\n\

-\n\

-       - The top-level (root) directory\n\

-       - Plug-in and Fragment directories\n\

-       - Inside Plug-ins and Fragments packaged as JARs\n\

-       - Sub-directories of the directory named "src" of certain Plug-ins\n\

-       - Feature directories\n\

-\n\

-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\

-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\

-Update License") during the installation process. If the Feature contains\n\

-Included Features, the Feature Update License should either provide you\n\

-with the terms and conditions governing the Included Features or inform\n\

-you where you can locate them. Feature Update Licenses may be found in\n\

-the "license" property of files named "feature.properties" found within a Feature.\n\

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\

-terms and conditions (or references to such terms and conditions) that\n\

-govern your use of the associated Content in that directory.\n\

-\n\

-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\

-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\

-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\

-\n\

-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\

-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\

-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\

-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\

-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\

-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\

-\n\

-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\

-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\

-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\

-govern that particular Content.\n\

-\n\

-\n\Use of Provisioning Technology\n\

-\n\

-The Eclipse Foundation makes available provisioning software, examples of which include,\n\

-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\

-the purpose of allowing users to install software, documentation, information and/or\n\

-other materials (collectively "Installable Software"). This capability is provided with\n\

-the intent of allowing such users to install, extend and update Eclipse-based products.\n\

-Information about packaging Installable Software is available at\n\

-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\

-\n\

-You may use Provisioning Technology to allow other parties to install Installable Software.\n\

-You shall be responsible for enabling the applicable license agreements relating to the\n\

-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\

-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\

-making it available in accordance with the Specification, you further acknowledge your\n\

-agreement to, and the acquisition of all necessary rights to permit the following:\n\

-\n\

-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\

-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\

-          extending or updating the functionality of an Eclipse-based product.\n\

-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\

-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\

-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\

-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\

-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\

-          with the Specification. Such Installable Software Agreement must inform the user of the\n\

-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\

-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\

-          indication of agreement by the user, the provisioning Technology will complete installation\n\

-          of the Installable Software.\n\

-\n\

-Cryptography\n\

-\n\

-Content may contain encryption software. The country in which you are\n\

-currently may have restrictions on the import, possession, and use,\n\

-and/or re-export to another country, of encryption software. BEFORE\n\

-using any encryption software, please check the country's laws,\n\

-regulations and policies concerning the import, possession, or use, and\n\

-re-export of encryption software, to see if this is permitted.\n\

-\n\

-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n

-########### end of license property ##########################################

+# "featureName" property - name of the feature

+featureName=RMF Examples Feature (Incubation)

+

+# "providerName" property - name of the company that provides the feature

+providerName=Eclipse Modeling Project

+

+# "updateSiteName" property - label for the update site

+

+# "description" property - description of the feature

+description=RMF Examples.

+

+# "copyright" property - text of the "Feature Update Copyright"

+

+

+

+

diff --git a/org.eclipse.rmf.examples.feature/feature.xml b/org.eclipse.rmf.examples.feature/feature.xml
index e129a0d..5903a01 100644
--- a/org.eclipse.rmf.examples.feature/feature.xml
+++ b/org.eclipse.rmf.examples.feature/feature.xml
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.rmf.examples.feature"
-      label="RMF Examples Feature (Incubation)"
-      version="0.9.0.qualifier"
-      provider-name="Eclipse Modeling Project">
+      label="%featureName"
+      version="0.10.0.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.1.qualifier">
 
    <description>
-      RMF Examples
+      %description
    </description>
 
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2013 itemis AG and others.
+All rights reserved.   This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
    </copyright>
 
    <license url="%licenseURL">
diff --git a/org.eclipse.rmf.examples.feature/pom.xml b/org.eclipse.rmf.examples.feature/pom.xml
index 165c729..2139ebd 100644
--- a/org.eclipse.rmf.examples.feature/pom.xml
+++ b/org.eclipse.rmf.examples.feature/pom.xml
@@ -6,11 +6,10 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.examples.feature</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<packaging>eclipse-feature</packaging>

 	<groupId>org.eclipse.rmf.features</groupId>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.installer/META-INF/MANIFEST.MF b/org.eclipse.rmf.examples.installer/META-INF/MANIFEST.MF
index 35425ce..2366809 100644
--- a/org.eclipse.rmf.examples.installer/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.examples.installer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rmf.examples.installer;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.rmf.examples.installer/about.html b/org.eclipse.rmf.examples.installer/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.examples.installer/about.html
+++ b/org.eclipse.rmf.examples.installer/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.installer/build.properties b/org.eclipse.rmf.examples.installer/build.properties
index 6a0dc03..516b737 100644
--- a/org.eclipse.rmf.examples.installer/build.properties
+++ b/org.eclipse.rmf.examples.installer/build.properties
@@ -1,3 +1,13 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 bin.includes = META-INF/,\
                examples/,\
                icons/,\
@@ -6,3 +16,4 @@
                about.html,\
                notice.html,\
                epl-v10.html
+source.. = src/
diff --git a/org.eclipse.rmf.examples.installer/epl-v10.html b/org.eclipse.rmf.examples.installer/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.examples.installer/epl-v10.html
+++ b/org.eclipse.rmf.examples.installer/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.installer/notice.html b/org.eclipse.rmf.examples.installer/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.examples.installer/notice.html
+++ b/org.eclipse.rmf.examples.installer/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.examples.installer/plugin.properties b/org.eclipse.rmf.examples.installer/plugin.properties
index e0f25c4..fd3eecf 100644
--- a/org.eclipse.rmf.examples.installer/plugin.properties
+++ b/org.eclipse.rmf.examples.installer/plugin.properties
@@ -1,13 +1,13 @@
-# /**
-#  * Copyright (c) 2008 IBM Corporation and others.
-#  * All rights reserved.   This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
-#  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
-#  *
-#  * Contributors:
-#  *   itemis - Initial API and implementation
-#  */
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 
 # NLS_MESSAGEFORMAT_VAR
 
diff --git a/org.eclipse.rmf.examples.installer/pom.xml b/org.eclipse.rmf.examples.installer/pom.xml
index 031cdf1..96393ef 100644
--- a/org.eclipse.rmf.examples.installer/pom.xml
+++ b/org.eclipse.rmf.examples.installer/pom.xml
@@ -19,19 +19,19 @@
 	<parent>
 		<groupId>org.eclipse.rmf</groupId>
 		<artifactId>org.eclipse.rmf.releng</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.10.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.rmf.examples.installer</artifactId>
-	<version>0.9.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.rmf.plugins</groupId>
+	<!-- 
  	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<executions>
 					<execution>
 						<id>plugin-source</id>
@@ -43,4 +43,5 @@
 			</plugin>
 		</plugins>
 	</build>
+	-->
 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.releng.devtool.modelcleaner/META-INF/MANIFEST.MF b/org.eclipse.rmf.releng.devtool.modelcleaner/META-INF/MANIFEST.MF
index c351603..2136395 100644
--- a/org.eclipse.rmf.releng.devtool.modelcleaner/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.releng.devtool.modelcleaner/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: Metamodel Plug-in

 Bundle-SymbolicName: org.eclipse.rmf.releng.devtools.modelcleaner

-Bundle-Version: 0.9.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Bundle-Vendor: 

diff --git a/org.eclipse.rmf.releng.devtool.modelcleaner/about.html b/org.eclipse.rmf.releng.devtool.modelcleaner/about.html
new file mode 100644
index 0000000..27e6801
--- /dev/null
+++ b/org.eclipse.rmf.releng.devtool.modelcleaner/about.html
@@ -0,0 +1,172 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>February 17, 2014</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+		
+<h3>Third Party Content</h3>
+<p>The Content includes items that have been sourced from third parties as set out below. If you 
+did not receive this Content directly from the Eclipse Foundation, the following is provided 
+for informational purposes only, and you should look to the Redistributor's license for 
+terms and conditions of use.</p>
+
+<h4>OMG ReqIF XML Schema</h4>
+
+<p>The plug-in is accompanied by the OMG ReqIF XML Schema files. The OMG ReqIF specification is available at: <a
+	href="http://www.omg.org/spec/ReqIF/">http://www.omg.org/spec/ReqIF/</a>.
+</p>
+	
+The following OMG ReqIF XML Schema files are located in the plug-in:
+<p>
+<ul>
+	<li><strong>resources/omg/reqif.xsd</strong> obtained from <a
+		href="http://www.omg.org/spec/ReqIF/20110401/reqif.xsd" 
+		target="_blank">http://www.omg.org/spec/ReqIF/20110401/reqif.xsd</a></li>
+	<li><strong>resources/omg/driver.xsd</strong> obtained from <a
+		href="http://www.omg.org/spec/ReqIF/20110402/driver.xsd"
+		target="_blank">http://www.omg.org/spec/ReqIF/20110402/driver.xsd</a></li>
+</ul>
+
+<p>Your use of the OMG ReqIF XML Schema files is governed by the terms and conditions of the
+Object Management Group License a copy of which is included in the file <a
+	href="about_files/OMG_NoticeAndLicense.html">about_files/OMG_NoticeAndLicense.html</a>
+and is also available in the ReqIF specification <a
+	href="http://www.omg.org/spec/ReqIF/1.1/PDF"
+	target="_blank">http://www.omg.org/spec/ReqIF/1.1/PDF</a>.</p>
+
+		
+<h4>W3C XHTML Modularization Schemas (subset)</h4>
+
+<p>The plug-in is accompanied by a subset of the XHTML Modularization XML Schema files which are referenced by the OMG ReqIF XML schema. The XHTML Modularization specification is available at: <a
+	href="http://www.w3.org/TR/xhtml-modularization/">http://www.w3.org/TR/xhtml-modularization/</a>.
+</p>
+	
+The following XHTML Modularization Schema files are located in the plug-in:
+<p>
+<ul>
+	<li><strong>resources/w3c/xhtml-attribs-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-attribs-1.xsd" target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-attribs-1.xsd</a></li>
+	<li><strong>resources/w3c/xhtml-blkphras-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-blkphras-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-blkphras-1.xsd</a></li>
+	<li><strong>resources/w3c/xhtml-blkpres-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-blkpres-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-blkpres-1.xsd</a></li>
+	<li><strong>resources/w3c/xhtml-blkstruct-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-blkstruct-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-blkstruct-1.xsd</a></li>
+	<li><strong>resources/w3c/xhtml-datatypes-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-datatypes-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-datatypes-1.xsd</a></li>
+	<li><strong>resources/w3c/xhtml-edit-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-edit-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-edit-1.xsd</a></li>
+    <li><strong>resources/w3c/xhtml-framework-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-framework-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-framework-1.xsd</a></li>
+	<li><strong>resources/w3c/xhtml-hypertext-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-hypertext-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-hypertext-1.xsd</a></li>
+	<li><strong>resources/w3c/xhtml-inlphras-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlphras-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlphras-1.xsd</a></li>
+	<li><strong>resources/w3c/xhtml-inlpres-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlpres-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlpres-1.xsd</a></li>
+	<li><strong>resources/w3c/xhtml-inlstruct-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlstruct-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlstruct-1.xsd</a></li>
+	<li><strong>resources/w3c/xhtml-inlstyle-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlstyle-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlstyle-1.xsd</a></li>
+	<li><strong>resources/w3c/xhtml-list-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-list-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-list-1.xsd</a></li>
+	<li><strong>resources/w3c/xhtml-object-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-object-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-object-1.xsd</a></li>
+	<li><strong>resources/w3c/xhtml-param-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-param-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-param-1.xsd</a></li>
+	<li><strong>resources/w3c/xhtml-pres-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-pres-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-pres-1.xsd</a></li>
+	<li><strong>resources/w3c/xhtml-table-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-table-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-table-1.xsd</a></li>
+	<li><strong>resources/w3c/xhtml-text-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-text-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-text-1.xsd</a></li>
+		
+		
+	<!-- uncomment as soon as the entity definitions are pushed to git
+	<li><strong>resources/w3c/xhtml-lat1.ent</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent" target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent</a></li>
+	<li><strong>resources/w3c/xhtml-special.ent</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent"
+		target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent</a></li>
+	<li><strong>resources/w3c/xhtml-symbol.ent</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent"
+		target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent</a></li>
+    -->
+</ul>
+
+<p>As described in the FAQ located at <a
+	href="http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html"
+	target="_blank">http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html</a>,
+your use of the W3C XHTML Schemas is governed by the terms and conditions of the
+W3C Software License a copy of which is included in the file <a
+	href="about_files/W3C_SoftwareNoticeAndLicense.html">about_files/W3C_SoftwareNoticeAndLicense.html</a>
+and is also available at <a
+	href="https://www.w3.org/Consortium/Legal/copyright-software"
+	target="_blank">https://www.w3.org/Consortium/Legal/copyright-software</a>.</p>
+	
+	
+<h4>W3C XML namespace Schema</h4>
+
+<p>The plug-in is accompanied by XML Namespace XML Schema file which are referenced by the OMG ReqIF Schemas and the W3C XHTML Modularization Schemas. The XML Namespace specification is available at: <a
+	href="http://www.w3.org/XML/1998/namespace.html">http://www.w3.org/XML/1998/namespace.html</a>.
+</p>
+	
+The following XML namespace XML Schema file is located in the plug-in:
+<p>
+<ul>
+	<li><strong>resources/w3c/xml.xsd</strong> obtained from <a
+		href="http://www.w3.org/2001/xml.xsd" 
+		target="_blank">http://www.w3.org/2001/xml.xsd</a></li>
+</ul>
+
+<p>As described in the FAQ located at <a
+	href="http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html"
+	target="_blank">http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html</a>,
+your use of the W3C namespace Schema is governed by the terms and conditions of the
+W3C Software License a copy of which is included in the file <a
+	href="about_files/W3C_SoftwareNoticeAndLicense.html">about_files/W3C_SoftwareNoticeAndLicense.html</a>
+and is also available at <a
+	href="https://www.w3.org/Consortium/Legal/copyright-software"
+	target="_blank">https://www.w3.org/Consortium/Legal/copyright-software</a>.</p>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.releng.devtool.modelcleaner/about_files/OMG_NoticeAndLicense.html b/org.eclipse.rmf.releng.devtool.modelcleaner/about_files/OMG_NoticeAndLicense.html
new file mode 100644
index 0000000..26bf939
--- /dev/null
+++ b/org.eclipse.rmf.releng.devtool.modelcleaner/about_files/OMG_NoticeAndLicense.html
@@ -0,0 +1,80 @@
+<html>
+<head>
+<title>OMG Notice and License</title>
+</head>
+
+<body>
+<h1>OMG Notice and License</h1>
+<h2>COPYRIGHTS</h2>
+<ul>
+<li>Copyright &copy; 2010, 88solutions Corporation </li>
+<li>Copyright &copy; 2010, Atego Systems GmbH  </li>
+<li>Copyright &copy; 2010, Audi AG </li>
+<li>Copyright &copy; 2010, BMW AG </li>
+<li>Copyright &copy; 2010, Continental AG </li>
+<li>Copyright &copy; 2010, Daimler AG </li>
+<li>Copyright &copy; 2010, HOOD GmbH </li>
+<li>Copyright &copy; 2010, International Business Machines  </li>
+<li>Copyright &copy; 2010, MKS GmbH </li>
+<li>Copyright &copy; 2010, ModelAlchemy Consulting  </li>
+<li>Copyright &copy; 2013, Object Management Group, Inc.  </li>
+<li>Copyright &copy; 2010, PROSTEP AG </li>
+<li>Copyright &copy; 2010, ProSTEP iViP Association  </li>
+<li>Copyright &copy; 2010, Robert Bosch GmbH </li>
+<li>Copyright &copy; 2010, Volkswagen AG </li>
+</ul>
+
+<h2>USE OF SPECIFICATION - TERMS, CONDITIONS & NOTICES</h2>
+<p>
+The material in this document details an Object Management Group specification in accordance with the terms, conditions and notices set forth below. This document does not represent a commitment to implement any portion of this specification in any company's products. The information contained in this document is subject to change without notice.
+</p>
+
+<h2>LICENSES</h2>
+<p>
+The companies listed above have granted to the Object Management Group, Inc. (OMG) a nonexclusive, royalty-free, paid up, worldwide license to copy and distribute this document and to modify this document and distribute copies of the modified version. Each of the copyright holders listed above has agreed that no person shall be deemed to have infringed the copyright in the included material of any such copyright holder by reason of having used the specification set forth herein or having conformed any computer software to the specification.
+</p>
+<p>
+Subject to all of the terms and conditions below, the owners of the copyright in this specification hereby grant you a fully-paid up, non-exclusive, nontransferable, perpetual, worldwide license (without the right to sublicense), to use this specification to create and distribute software and special purpose specifications that are based upon this specification, and to use, copy, and distribute this specification as provided under the Copyright Act; provided that:
+<ol>
+<li>both the copyright notice identified above and this permission notice appear on any copies of this specification; </li>
+<li>the use of the specifications is for informational purposes and will not be copied or posted on any network computer or broadcast in any media and will not be otherwise resold or transferred for commercial purposes; and </li>
+<li>no modifications are made to this specification. </li>
+</ol>
+This limited permission automatically terminates without notice if you breach any of these terms or conditions. Upon termination, you will destroy immediately any copies of the specifications in your possession or control.</p>
+
+<h2>PATENTS</h2>
+<p>
+The attention of adopters is directed to the possibility that compliance with or adoption of OMG specifications may require use of an invention covered by patent rights. OMG shall not be responsible for identifying patents for which a license may be required by any OMG specification, or for conducting legal inquiries into the legal validity or scope of those patents that are brought to its attention. OMG specifications are prospective and advisory only. Prospective users are responsible for protecting themselves against liability for infringement of patents.
+</p>
+
+<h2>GENERAL USE RESTRICTIONS</h2>
+<p>
+Any unauthorized use of this specification may violate copyright laws, trademark laws, and communications regulations and statutes. This document contains information which is protected by copyright. All Rights Reserved. No part of this work covered by copyright herein may be reproduced or used in any form or by any means--graphic, electronic, or mechanical, including photocopying, recording, taping, or information storage and retrieval systems--without permission of the copyright owner.
+</p>
+
+<h2>DISCLAIMER OF WARRANTY</h2>
+<p>
+WHILE THIS PUBLICATION IS BELIEVED TO BE ACCURATE, IT IS PROVIDED "AS IS" AND MAY CONTAIN ERRORS OR MISPRINTS. THE OBJECT MANAGEMENT GROUP AND THE COMPANIES LISTED ABOVE MAKE NO WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, WITH REGARD TO THIS PUBLICATION, INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF TITLE OR OWNERSHIP, IMPLIED WARRANTY OF MERCHANTABILITY OR WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE OR USE.
+IN NO EVENT SHALL THE OBJECT MANAGEMENT GROUP OR ANY OF THE COMPANIES LISTED ABOVE BE LIABLE FOR ERRORS CONTAINED HEREIN OR FOR DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL, RELIANCE OR COVER DAMAGES, INCLUDING LOSS OF PROFITS, REVENUE, DATA OR USE, INCURRED BY ANY USER OR ANY THIRD PARTY IN CONNECTION WITH THE FURNISHING, PERFORMANCE, OR USE OF THIS MATERIAL, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+</p>
+<p>
+The entire risk as to the quality and performance of software developed using this specification is borne by you. This disclaimer of warranty constitutes an essential part of the license granted to you to use this specification.
+</p>
+
+<h2>RESTRICTED RIGHTS LEGEND</h2>
+<p>
+Use, duplication or disclosure by the U.S. Government is subject to the restrictions set forth in subparagraph (c) (1) (ii) of The Rights in Technical Data and Computer Software Clause at DFARS 252.227-7013 or in subparagraph (c)(1) and (2) of the Commercial Computer Software - Restricted Rights clauses at 48 C.F.R. 52.227-19 or as specified in 48 C.F.R. 227-7202-2 of the DoD F.A.R. Supplement and its successors, or as specified in 48 C.F.R. 12.212 of the Federal Acquisition Regulations and its successors, as applicable. The specification copyright owners are as indicated above and may be contacted through the Object Management Group, 109 Highland Avenue, Needham, MA 02494, U.S.A.
+</p>
+
+<h2>TRADEMARKS</h2>
+<p>
+IMM&reg;, MDA&reg;, Model Driven Architecture&reg;, UML&reg;, UML Cube logo&reg;, OMG Logo&reg;, CORBA&reg; and XMI&reg; are registered trademarks of the Object Management Group, Inc., and Object Management Group&trade;, OMG&trade; , Unified Modeling Language&trade;, Model Driven Architecture Logo&trade;, Model Driven Architecture Diagram&trade;, CORBA logos&trade;, XMI Logo&trade;, CWM&trade;, CWM Logo&trade;, MOF&trade; ,MOF&trade; , OMG Interface Definition Language (IDL)&trade; , and OMG SysML&trade; are trademarks of the Object Management Group. All other products or company names mentioned are used for identification purposes only, and may be trademarks of their respective owners.
+</p>
+
+<h2>COMPLIANCE</h2>
+<p>
+The copyright holders listed above acknowledge that the Object Management Group (acting itself or through its designees) is and shall at all times be the sole entity that may authorize developers, suppliers and sellers of computer software to use certification marks, trademarks or other special designations to indicate compliance with these materials. Software developed under the terms of this license may claim compliance or conformance with this specification if and only if the software compliance is of a nature fully matching the applicable compliance points as stated in the specification. Software developed only partially matching the applicable compliance points may claim only that the software was based on this specification, but may not claim compliance or conformance with this specification. In the event that testing suites are implemented or approved by Object Management Group, Inc., software developed using this specification may claim compliance or conformance with the specification only if the software satisfactorily completes the testing suites.
+</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.releng.devtool.modelcleaner/about_files/W3C_SoftwareNoticeAndLicense.html b/org.eclipse.rmf.releng.devtool.modelcleaner/about_files/W3C_SoftwareNoticeAndLicense.html
new file mode 100644
index 0000000..2020990
--- /dev/null
+++ b/org.eclipse.rmf.releng.devtool.modelcleaner/about_files/W3C_SoftwareNoticeAndLicense.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <title>W3C Software Notice and License</title>
+</head><body>
+    
+               <h1 class="title">W3C Software Notice and License</h1>
+                     <p>This work (and included software, documentation such as READMEs, or other
+related items) is being provided by the copyright holders under the following
+license.</p>
+<h2>License</h2>
+                     
+                     <p>
+By obtaining, using and/or copying this work, you (the licensee)
+agree that you have read, understood, and will comply with the following
+terms and conditions.</p>
+
+                     <p>Permission to copy, modify, and distribute this software and its
+documentation, with or without modification,&#xA0;for any purpose and without
+fee or royalty is hereby granted, provided that you include the following on
+ALL copies of the software and documentation or portions thereof, including
+modifications:</p>
+
+                     <ul><li>The full text of this NOTICE in a location viewable to users of the
+    redistributed or derivative work.</li><li>Any pre-existing intellectual property disclaimers, notices, or terms
+    and conditions. If none exist, the <a href="http://www.w3.org/Consortium/Legal/2002/copyright-software-short-notice-20021231.html">W3C Software Short
+    Notice</a> should be included (hypertext is preferred, text is permitted)
+    within the body of any redistributed or derivative code.</li><li>Notice of any changes or modifications to the files, including the date
+    changes were made. (We recommend you provide URIs to the location from
+    which the code is derived.)</li></ul>
+
+<h2>Disclaimers</h2>
+
+                     <p>THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
+MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
+PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
+ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
+
+                     <p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+DOCUMENTATION.</p>
+
+                     <p>The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to the software without specific, written
+prior permission. Title to copyright in this software and any associated
+documentation will at all times remain with copyright holders.</p>
+
+                     <h2>Notes</h2>
+
+	                    <p>This version: http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231</p>
+
+                     <p>This formulation of W3C's notice and license became active on December 31
+2002. This version removes the copyright ownership notice such that this
+license can be used with materials other than those owned by the W3C,
+reflects that ERCIM is now a host of the W3C, includes references to this
+specific dated version of the license, and removes the ambiguous grant of
+"use". Otherwise, this version is the same as the <a href="http://www.w3.org/Consortium/Legal/copyright-software-19980720">previous
+version</a> and is written so as to preserve the <a href="http://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses">Free
+Software Foundation's assessment of GPL compatibility</a> and <a href="http://www.opensource.org/licenses/W3C.php">OSI's certification</a>
+under the <a href="http://www.opensource.org/docs/definition.php">Open Source
+Definition</a>.</p>
+
+      
+                <p class="copyright">Copyright &#xA9; 2012 W3C <sup>&#xAE;</sup> (<a href="http://www.csail.mit.edu/">
+                  <acronym title="Massachusetts Institute of Technology">MIT</acronym>
+               </a>, <a href="http://www.ercim.org/">
+                  <acronym title="European Research Consortium for Informatics and Mathematics"> ERCIM</acronym>
+               </a>, <a href="http://www.keio.ac.jp/">Keio</a>, <a href="http://ev.buaa.edu.cn/">Beihang</a>) <a href="http://www.w3.org/Consortium/Legal/2002/ipr-notice-20021231">Usage policies apply</a>.</p>
+      
+     </body>
+</html>
diff --git a/org.eclipse.rmf.releng.devtool.modelcleaner/ant/prortoolextension/generate.properties b/org.eclipse.rmf.releng.devtool.modelcleaner/ant/prortoolextension/generate.properties
index a497124..48696d1 100644
--- a/org.eclipse.rmf.releng.devtool.modelcleaner/ant/prortoolextension/generate.properties
+++ b/org.eclipse.rmf.releng.devtool.modelcleaner/ant/prortoolextension/generate.properties
@@ -1,4 +1,14 @@
-# TODO: insert header
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
+# TODO: 
 # make sure only relative paths are used.
 # this makes sure that these properties can be used for URI based and file based resolution
 GEN_FOLDER=./gen/prortoolextension
diff --git a/org.eclipse.rmf.releng.devtool.modelcleaner/ant/reqif10-xhtml/generate.properties b/org.eclipse.rmf.releng.devtool.modelcleaner/ant/reqif10-xhtml/generate.properties
index 50e7e80..b7cd2f4 100644
--- a/org.eclipse.rmf.releng.devtool.modelcleaner/ant/reqif10-xhtml/generate.properties
+++ b/org.eclipse.rmf.releng.devtool.modelcleaner/ant/reqif10-xhtml/generate.properties
@@ -1,3 +1,13 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 # TODO: insert header
 # make sure only relative paths are used.
 # this makes sure that these properties can be used for URI based and file based resolution
diff --git a/org.eclipse.rmf.releng.devtool.modelcleaner/ant/reqif10/generate.properties b/org.eclipse.rmf.releng.devtool.modelcleaner/ant/reqif10/generate.properties
index 049fe4f..fbab196 100644
--- a/org.eclipse.rmf.releng.devtool.modelcleaner/ant/reqif10/generate.properties
+++ b/org.eclipse.rmf.releng.devtool.modelcleaner/ant/reqif10/generate.properties
@@ -1,4 +1,14 @@
-# TODO: insert header
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
+# TODO: 
 # make sure only relative paths are used.
 # this makes sure that these properties can be used for URI based and file based resolution
 GEN_FOLDER=./gen/reqif10
diff --git a/org.eclipse.rmf.releng.devtool.modelcleaner/build.properties b/org.eclipse.rmf.releng.devtool.modelcleaner/build.properties
index ffbdafb..4c5293a 100644
--- a/org.eclipse.rmf.releng.devtool.modelcleaner/build.properties
+++ b/org.eclipse.rmf.releng.devtool.modelcleaner/build.properties
@@ -1,2 +1,18 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 bin.includes = META-INF/,\
-               transforms/
+               transforms/,\
+               about.html,\
+               about_files/,\
+               epl-v10.html,\
+               notice.html,\
+               resources/,\
+               ant/
diff --git a/org.eclipse.rmf.examples.feature/epl-v10.html b/org.eclipse.rmf.releng.devtool.modelcleaner/epl-v10.html
similarity index 99%
rename from org.eclipse.rmf.examples.feature/epl-v10.html
rename to org.eclipse.rmf.releng.devtool.modelcleaner/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.examples.feature/epl-v10.html
+++ b/org.eclipse.rmf.releng.devtool.modelcleaner/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/notice.html b/org.eclipse.rmf.releng.devtool.modelcleaner/notice.html
similarity index 97%
rename from org.eclipse.rmf.examples.feature/notice.html
rename to org.eclipse.rmf.releng.devtool.modelcleaner/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.examples.feature/notice.html
+++ b/org.eclipse.rmf.releng.devtool.modelcleaner/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html b/org.eclipse.rmf.releng.examples/about.html
similarity index 99%
rename from org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
rename to org.eclipse.rmf.releng.examples/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
+++ b/org.eclipse.rmf.releng.examples/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/epl-v10.html b/org.eclipse.rmf.releng.examples/epl-v10.html
similarity index 99%
copy from org.eclipse.rmf.examples.feature/epl-v10.html
copy to org.eclipse.rmf.releng.examples/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.examples.feature/epl-v10.html
+++ b/org.eclipse.rmf.releng.examples/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/notice.html b/org.eclipse.rmf.releng.examples/notice.html
similarity index 97%
copy from org.eclipse.rmf.examples.feature/notice.html
copy to org.eclipse.rmf.releng.examples/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.examples.feature/notice.html
+++ b/org.eclipse.rmf.releng.examples/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.releng.examples/src/org/eclipse/rmf/releng/examples/GenerateExampleBuilders.java b/org.eclipse.rmf.releng.examples/src/org/eclipse/rmf/releng/examples/GenerateExampleBuilders.java
index 333f237..060ca66 100644
--- a/org.eclipse.rmf.releng.examples/src/org/eclipse/rmf/releng/examples/GenerateExampleBuilders.java
+++ b/org.eclipse.rmf.releng.examples/src/org/eclipse/rmf/releng/examples/GenerateExampleBuilders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Eclipse contributors and others.
+ * Copyright (c) 2012, 2013 Eclipse contributors and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.releng.product/.classpath b/org.eclipse.rmf.releng.product/.classpath
new file mode 100644
index 0000000..ac37fb2
--- /dev/null
+++ b/org.eclipse.rmf.releng.product/.classpath
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html b/org.eclipse.rmf.releng.product/about.html
similarity index 99%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
copy to org.eclipse.rmf.releng.product/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
+++ b/org.eclipse.rmf.releng.product/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/epl-v10.html b/org.eclipse.rmf.releng.product/epl-v10.html
similarity index 99%
copy from org.eclipse.rmf.examples.feature/epl-v10.html
copy to org.eclipse.rmf.releng.product/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.examples.feature/epl-v10.html
+++ b/org.eclipse.rmf.releng.product/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/notice.html b/org.eclipse.rmf.releng.product/notice.html
similarity index 97%
copy from org.eclipse.rmf.examples.feature/notice.html
copy to org.eclipse.rmf.releng.product/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.examples.feature/notice.html
+++ b/org.eclipse.rmf.releng.product/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.releng.product/org/eclipse/rmf/reqif10/pror/splashHandlers/BrowserSplashHandler.java b/org.eclipse.rmf.releng.product/org/eclipse/rmf/reqif10/pror/splashHandlers/BrowserSplashHandler.java
deleted file mode 100644
index cd73f01..0000000
--- a/org.eclipse.rmf.releng.product/org/eclipse/rmf/reqif10/pror/splashHandlers/BrowserSplashHandler.java
+++ /dev/null
@@ -1,177 +0,0 @@
-
-package org.eclipse.rmf.reqif10.pror.splashHandlers;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.browser.ProgressEvent;
-import org.eclipse.swt.browser.ProgressListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.splash.AbstractSplashHandler;
-
-/**
- * @since 3.3
- * 
- */
-public class BrowserSplashHandler extends AbstractSplashHandler {
-
-	private final static String F_BROWSER_URL = "http://www.google.com"; //NON-NLS-1
-	
-	private Browser fBrowser;
-	
-	private Button fButton;
-	
-	private boolean fClose;
-
-	/**
-	 * 
-	 */
-	public BrowserSplashHandler() {
-		fBrowser = null;
-		fButton = null;
-		fClose = false;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.internal.splash.AbstractSplashHandler#init(org.eclipse.swt.widgets.Shell,
-	 *      org.eclipse.ui.IWorkbench)
-	 */
-	public void init(final Shell splash) {
-		// Store the shell
-		super.init(splash);
-		// Configure the shell layout
-		configureUISplash();
-		// Create UI
-		createUI();
-		// Create UI listeners
-		createUIListeners();
-		// Force the UI to layout
-		splash.layout(true);
-		// Keep the splash screen visible and prevent the RCP application from 
-		// loading until the close button is clicked.
-		doEventLoop();
-	}
-	
-	/**
-	 * 
-	 */
-	private void doEventLoop() {
-		Shell splash = getSplash();
-		while (fClose == false) {
-			if (splash.getDisplay().readAndDispatch() == false) {
-				splash.getDisplay().sleep();
-			}
-		}
-	}
-	
-	/**
-	 * 
-	 */
-	private void createUIListeners() {
-		// Create the browser listeners
-		createUIListenersBrowser();
-		// Create the button listeners
-		createUIListenersButton();
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIListenersButton() {
-		fButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// NO-OP
-			}
-			public void widgetSelected(SelectionEvent e) {
-				fClose = true;
-			}
-		});		
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIListenersBrowser() {
-		fBrowser.addProgressListener(new ProgressListener() {
-			public void changed(ProgressEvent event) {
-				// NO-OP
-			}
-			public void completed(ProgressEvent event) {
-				// Only show the UI when the URL is fully loaded into the 
-				// browser
-				fBrowser.setVisible(true);
-				fButton.setVisible(true);
-			}
-		});		
-	}
-	
-	/**
-	 * 
-	 */
-	private void createUI() {
-		// Create the web browser
-		createUIBrowser();
-		// Create the close button
-		createUIButton();
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIButton() {
-		Shell splash = getSplash();
-		fButton = new Button(splash, SWT.PUSH);
-		fButton.setText("Close"); //NON-NLS-1
-		fButton.setVisible(false);
-		// Configure the button bounds
-		configureUIButtonBounds();		
-		// Configure layout data
-		GridData data = new GridData(SWT.CENTER, SWT.FILL, false, false);
-		data.widthHint = 80;			
-		fButton.setLayoutData(data);
-	}
-
-	/**
-	 * 
-	 */
-	private void configureUIButtonBounds() {
-		Shell splash = getSplash();
-		
-		int button_x_coord = (splash.getSize().x / 2)
-				- (fButton.computeSize(SWT.DEFAULT, SWT.DEFAULT).x / 2);
-		int button_y_coord = splash.getSize().y
-				- fButton.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
-		int button_x_width = splash.getSize().x;
-		int button_y_width = fButton.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
-		
-		fButton.setBounds(button_x_coord, button_y_coord, button_x_width,
-				button_y_width);		
-	}	
-	
-	/**
-	 * 
-	 */
-	private void createUIBrowser() {
-		fBrowser = new Browser(getSplash(), SWT.NONE);
-		fBrowser.setUrl(F_BROWSER_URL);
-		fBrowser.setVisible(false);
-		// Configure layout data
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
-		fBrowser.setLayoutData(data);
-	}
-
-	/**
-	 * 
-	 */
-	private void configureUISplash() {
-		GridLayout layout = new GridLayout(1, true);
-		getSplash().setLayout(layout);
-	}
-
-}
diff --git a/org.eclipse.rmf.releng.product/pom.xml b/org.eclipse.rmf.releng.product/pom.xml
index 97630c1..29ee5c1 100644
--- a/org.eclipse.rmf.releng.product/pom.xml
+++ b/org.eclipse.rmf.releng.product/pom.xml
@@ -6,16 +6,15 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.releng.product</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<packaging>eclipse-repository</packaging>

 	

 	<properties>

     	<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>

-    	<app.version>0.9.0</app.version>

+    	<app.version>0.10.0</app.version>

   	</properties>

 	

 	<build>

@@ -23,7 +22,7 @@
 			<!--plugin>

 		        <groupId>org.eclipse.tycho</groupId>

 		        <artifactId>tycho-p2-repository-plugin</artifactId>

-		        <version>${tycho-version}</version>

+		        <version>${tycho.version}</version>

 		        <configuration>

 		          <includeAllDependencies>true</includeAllDependencies>

 		        </configuration>

@@ -31,7 +30,7 @@
 	      	<plugin>

 				<groupId>org.eclipse.tycho</groupId>

 				<artifactId>tycho-p2-publisher-plugin</artifactId>

-				<version>${tycho-version}</version>

+				<version>${tycho.version}</version>

 				<configuration>

 					<publishArtifacts>true</publishArtifacts>

 				</configuration>

@@ -39,7 +38,7 @@
 			<plugin>

 				<groupId>org.eclipse.tycho</groupId>

 				<artifactId>tycho-p2-director-plugin</artifactId>

-				<version>${tycho-version}</version>

+				<version>${tycho.version}</version>

 				  <configuration>

 				    <additionalIUs>

 				      <additionalIU>org.eclipse.rmf.reqif10.pror.feature.feature.group</additionalIU>

diff --git a/org.eclipse.rmf.releng.product/rmf-pror-standalone.product b/org.eclipse.rmf.releng.product/rmf-pror-standalone.product
index 6fc6499..a84ed9e 100644
--- a/org.eclipse.rmf.releng.product/rmf-pror-standalone.product
+++ b/org.eclipse.rmf.releng.product/rmf-pror-standalone.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="RMF ProR Standalone" uid="org.eclipse.rmf.reqif10.pror.product" id="org.eclipse.rmf.reqif10.pror.product" application="org.eclipse.ui.ide.workbench" version="0.9.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="RMF ProR Standalone" uid="org.eclipse.rmf.reqif10.pror.product" id="org.eclipse.rmf.reqif10.pror.product" application="org.eclipse.ui.ide.workbench" version="0.10.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.rmf.reqif10.pror/pror-about.png"/>
@@ -14,7 +14,7 @@
 
 Version: (Incubation Submission)
 
-(c) Copyright Formal Mind GmbH, itemis AG and others 2011.  All rights reserved.
+(c) Copyright Formal Mind GmbH, itemis AG and others 2011-2014.  All rights reserved.
 Visit http://eclipse.org/rmf
       </text>
    </aboutInfo>
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html b/org.eclipse.rmf.releng.repository/about.html
similarity index 99%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
copy to org.eclipse.rmf.releng.repository/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
+++ b/org.eclipse.rmf.releng.repository/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.releng.repository/category.xml b/org.eclipse.rmf.releng.repository/category.xml
index dab57ab..d5018be 100644
--- a/org.eclipse.rmf.releng.repository/category.xml
+++ b/org.eclipse.rmf.releng.repository/category.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.rmf.reqif10.pror.sdk.feature_0.9.0.qualifier.jar" id="org.eclipse.rmf.reqif10.pror.sdk.feature" version="0.9.0.qualifier">
+   <feature url="features/org.eclipse.rmf.reqif10.pror.sdk.feature_0.10.0.qualifier.jar" id="org.eclipse.rmf.reqif10.pror.sdk.feature" version="0.10.0.qualifier">
       <category name="RMF SDK"/>
    </feature>
-   <feature url="features/org.eclipse.rmf.reqif10.sdk.feature_0.9.0.qualifier.jar" id="org.eclipse.rmf.reqif10.sdk.feature" version="0.9.0.qualifier">
+   <feature url="features/org.eclipse.rmf.reqif10.sdk.feature_0.10.0.qualifier.jar" id="org.eclipse.rmf.reqif10.sdk.feature" version="0.10.0.qualifier">
       <category name="RMF SDK"/>
    </feature>
-   <feature url="features/org.eclipse.rmf.examples.feature_0.9.0.qualifier.jar" id="org.eclipse.rmf.examples.feature" version="0.9.0.qualifier">
+   <feature url="features/org.eclipse.rmf.examples.feature_0.10.0.qualifier.jar" id="org.eclipse.rmf.examples.feature" version="0.10.0.qualifier">
       <category name="RMF"/>
    </feature>
-   <feature url="features/org.eclipse.rmf.reqif10.feature_0.9.0.qualifier.jar" id="org.eclipse.rmf.reqif10.feature" version="0.9.0.qualifier">
+   <feature url="features/org.eclipse.rmf.reqif10.feature_0.10.0.qualifier.jar" id="org.eclipse.rmf.reqif10.feature" version="0.10.0.qualifier">
       <category name="RMF"/>
    </feature>
-   <feature url="features/org.eclipse.rmf.reqif10.pror.feature_0.9.0.qualifier.jar" id="org.eclipse.rmf.reqif10.pror.feature" version="0.9.0.qualifier">
+   <feature url="features/org.eclipse.rmf.reqif10.pror.feature_0.10.0.qualifier.jar" id="org.eclipse.rmf.reqif10.pror.feature" version="0.10.0.qualifier">
       <category name="RMF"/>
    </feature>
    <category-def name="RMF" label="RMF"/>
diff --git a/org.eclipse.rmf.examples.feature/epl-v10.html b/org.eclipse.rmf.releng.repository/epl-v10.html
similarity index 99%
copy from org.eclipse.rmf.examples.feature/epl-v10.html
copy to org.eclipse.rmf.releng.repository/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.examples.feature/epl-v10.html
+++ b/org.eclipse.rmf.releng.repository/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/notice.html b/org.eclipse.rmf.releng.repository/notice.html
similarity index 97%
copy from org.eclipse.rmf.examples.feature/notice.html
copy to org.eclipse.rmf.releng.repository/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.examples.feature/notice.html
+++ b/org.eclipse.rmf.releng.repository/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.releng.repository/pom.xml b/org.eclipse.rmf.releng.repository/pom.xml
index fb9dcbc..289d65a 100644
--- a/org.eclipse.rmf.releng.repository/pom.xml
+++ b/org.eclipse.rmf.releng.repository/pom.xml
@@ -6,11 +6,10 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.releng.repository</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<packaging>eclipse-repository</packaging>

 		

 <!--  

diff --git a/org.eclipse.rmf.releng.target/INDIGO_3_7_2.target b/org.eclipse.rmf.releng.target/INDIGO_3_7_2.target
index 112a38a..e6c686a 100644
--- a/org.eclipse.rmf.releng.target/INDIGO_3_7_2.target
+++ b/org.eclipse.rmf.releng.target/INDIGO_3_7_2.target
@@ -1,31 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target includeMode="feature" name="INDIGO_3_7_2_Michael" sequenceNumber="65">
+<?pde version="3.8"?><target includeMode="feature" name="INDIGO_3_7_2" sequenceNumber="69">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.jdt.feature.group" version="3.7.2.v20120120-1414-7z8gFcuFMP7BW5XTz0jLTnz0l9B1"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.7.2.v20120130-0943"/>
-<unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.1.R37x_v20110907-7M7W8i8eNV4WsRkue-4Vq4J6pCyW"/>
+<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.5.0.v20110502-1600-67O-96SGR55YJeZPedcQnghI6uFA"/>
 <unit id="org.eclipse.xsd.sdk.feature.group" version="2.7.1.v20120130-0943"/>
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.1.R37x_v20110907-7M7W8i8eNV4WsRkue-4Vq4J6pCyW"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.7.2.v20120130-0943"/>
 <repository location="http://download.eclipse.org/releases/indigo"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sphinx.core.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sphinx.testutils.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/sphinx/updates/interim"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.compare.sdk.feature.group" version="1.3.2.v20120918-1125"/>
-<repository location="http://download.eclipse.org/modeling/emf/compare/updates/releases/1.3"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.agilemore.agilegrid.feature.feature.group" version="1.3.3"/>
-<repository location="http://agilegrid.sourceforge.net/agilegrid/updatesite-rmf/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.poi" version="3.9.0.v201303080712"/>
 <unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
 <unit id="com.google.guava" version="10.0.1.v201203051515"/>
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.compare.sdk.feature.group" version="1.3.3.v20130213-0806"/>
+<repository location="http://download.eclipse.org/modeling/emf/compare/updates/releases/1.3/R20130213-0806/"/>
+</location>
 </locations>
 </target>
diff --git a/org.eclipse.rmf.releng.target/JUNO_4_2_2.target b/org.eclipse.rmf.releng.target/JUNO_4_2_2.target
index 4ba1665..9463abf 100644
--- a/org.eclipse.rmf.releng.target/JUNO_4_2_2.target
+++ b/org.eclipse.rmf.releng.target/JUNO_4_2_2.target
@@ -1,28 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="JUNO_4_2_2" sequenceNumber="11">
+<?pde version="3.8"?><target name="JUNO_4_2_2" sequenceNumber="14">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.agilemore.agilegrid.feature.feature.group" version="1.3.3"/>
-<repository location="http://agilegrid.sourceforge.net/agilegrid/updatesite-rmf/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jdt.feature.group" version="3.8.2.v20130116-090414-8-8nFu3FNOfwKLRuqgXKIy9z0I83"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.8.3.v20130125-0826"/>
-<unit id="org.eclipse.emf.compare.sdk.feature.group" version="1.3.3.v20130213-0806"/>
-<unit id="org.eclipse.equinox.sdk.feature.group" version="3.8.0.v20121212-203907-7M7fA78g4_y-gDvtH0ZcFvhMPDZJ"/>
-<unit id="org.eclipse.xsd.sdk.feature.group" version="2.8.2.v20130125-0826"/>
-<repository location="http://download.eclipse.org/releases/juno"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sphinx.core.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sphinx.testutils.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/sphinx/updates/interim"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.poi" version="3.9.0.v201303080712"/>
 <unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
 <unit id="com.google.guava" version="10.0.1.v201203051515"/>
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.6.0.v20120328-0001-67T-96SGR75UNqZNTdeQnghI6uFA"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.8.3.v20130125-0826"/>
+<unit id="org.eclipse.xsd.sdk.feature.group" version="2.8.2.v20130125-0826"/>
+<unit id="org.eclipse.emf.compare.sdk.feature.group" version="1.3.3.v20130213-0806"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.8.2.v20130116-090414-8-8nFu3FNOfwKLRuqgXKIy9z0I83"/>
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.8.0.v20121212-203907-7M7fA78g4_y-gDvtH0ZcFvhMPDZJ"/>
+<repository location="http://download.eclipse.org/releases/juno"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.compare.sdk.feature.group" version="1.3.3.v20130213-0806"/>
+<repository location="http://download.eclipse.org/modeling/emf/compare/updates/releases/1.3/R20130213-0806/"/>
+</location>
 </locations>
 </target>
diff --git a/org.eclipse.rmf.releng.target/KEPLER_4_3_0.target b/org.eclipse.rmf.releng.target/KEPLER_4_3_0.target
index 90078d4..37134fb 100644
--- a/org.eclipse.rmf.releng.target/KEPLER_4_3_0.target
+++ b/org.eclipse.rmf.releng.target/KEPLER_4_3_0.target
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="KEPLER_4_3_0" sequenceNumber="14">
+<?pde version="3.8"?><target name="KEPLER_4_3_0" sequenceNumber="16">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.sdk.feature.group" version="3.9.0.v20130604-2047"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.9.0.v20130610-0406"/>
-<unit id="org.eclipse.emf.compare.source.feature.group" version="2.1.0.201306101322"/>
-<unit id="org.eclipse.xsd.sdk.feature.group" version="2.9.0.v20130610-0406"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.9.0.v20130605-2000"/>
+<unit id="org.eclipse.xsd.sdk.feature.group" version="2.9.1.v20130902-0605"/>
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.9.0.v20130828-0031"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.9.1.v20130911-1000"/>
+<unit id="org.eclipse.emf.compare.source.feature.group" version="2.1.1.201309031318"/>
+<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.7.0.201306111341"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.9.1.v20130902-0605"/>
 <repository location="http://download.eclipse.org/releases/kepler/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.agilemore.agilegrid.feature.feature.group" version="1.3.3"/>
-<repository location="http://agilegrid.sourceforge.net/agilegrid/updatesite-rmf/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.poi" version="3.9.0.v201303080712"/>
 <unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
 <unit id="com.google.guava" version="10.0.1.v201203051515"/>
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html b/org.eclipse.rmf.releng.target/about.html
similarity index 99%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
copy to org.eclipse.rmf.releng.target/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
+++ b/org.eclipse.rmf.releng.target/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/epl-v10.html b/org.eclipse.rmf.releng.target/epl-v10.html
similarity index 99%
copy from org.eclipse.rmf.examples.feature/epl-v10.html
copy to org.eclipse.rmf.releng.target/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.examples.feature/epl-v10.html
+++ b/org.eclipse.rmf.releng.target/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.releng.target/indigo/indigo.target b/org.eclipse.rmf.releng.target/indigo/indigo.target
new file mode 100644
index 0000000..dc0b113
--- /dev/null
+++ b/org.eclipse.rmf.releng.target/indigo/indigo.target
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target includeMode="feature" name="INDIGO_3_7_2" sequenceNumber="68">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.agilemore.agilegrid.feature.feature.group" version="1.3.3"/>
+<repository location="http://agilegrid.sourceforge.net/agilegrid/updatesite-rmf/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.feature.group" version="3.7.2.v20120120-1414-7z8gFcuFMP7BW5XTz0jLTnz0l9B1"/>
+<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.5.0.v20110502-1600-67O-96SGR55YJeZPedcQnghI6uFA"/>
+<unit id="org.eclipse.xsd.sdk.feature.group" version="2.7.1.v20120130-0943"/>
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.1.R37x_v20110907-7M7W8i8eNV4WsRkue-4Vq4J6pCyW"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.7.2.v20120130-0943"/>
+<repository location="http://download.eclipse.org/releases/indigo"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.poi" version="3.9.0.v201303080712"/>
+<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
+<unit id="com.google.guava" version="10.0.1.v201203051515"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.compare.sdk.feature.group" version="1.3.3.v20130213-0806"/>
+<repository location="http://download.eclipse.org/modeling/emf/compare/updates/releases/1.3/R20130213-0806/"/>
+</location>
+</locations>
+</target>
diff --git a/org.eclipse.rmf.releng.target/indigo/pom.xml b/org.eclipse.rmf.releng.target/indigo/pom.xml
new file mode 100644
index 0000000..dd2492d
--- /dev/null
+++ b/org.eclipse.rmf.releng.target/indigo/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+		<groupId>org.eclipse.rmf</groupId>

+		<artifactId>org.eclipse.rmf.releng</artifactId>

+		<version>0.10.0-SNAPSHOT</version>

+		<relativePath>../../org.eclipse.rmf.releng/pom.xml</relativePath>

+	</parent>

+	<groupId>org.eclipse.rmf.releng.target</groupId>

+	<artifactId>indigo</artifactId>

+	<version>0.10.0-SNAPSHOT</version>

+	<packaging>eclipse-target-definition</packaging>

+</project>

diff --git a/org.eclipse.rmf.releng.target/juno/juno.target b/org.eclipse.rmf.releng.target/juno/juno.target
new file mode 100644
index 0000000..9f4297a
--- /dev/null
+++ b/org.eclipse.rmf.releng.target/juno/juno.target
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="JUNO_4_2_2" sequenceNumber="13">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.6.0.v20120328-0001-67T-96SGR75UNqZNTdeQnghI6uFA"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.8.3.v20130125-0826"/>
+<unit id="org.eclipse.xsd.sdk.feature.group" version="2.8.2.v20130125-0826"/>
+<unit id="org.eclipse.emf.compare.sdk.feature.group" version="1.3.3.v20130213-0806"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.8.2.v20130116-090414-8-8nFu3FNOfwKLRuqgXKIy9z0I83"/>
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.8.0.v20121212-203907-7M7fA78g4_y-gDvtH0ZcFvhMPDZJ"/>
+<repository location="http://download.eclipse.org/releases/juno"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.poi" version="3.9.0.v201303080712"/>
+<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
+<unit id="com.google.guava" version="10.0.1.v201203051515"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.agilemore.agilegrid.feature.feature.group" version="1.3.3"/>
+<repository location="http://agilegrid.sourceforge.net/agilegrid/updatesite-rmf/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.compare.sdk.feature.group" version="1.3.3.v20130213-0806"/>
+<repository location="http://download.eclipse.org/modeling/emf/compare/updates/releases/1.3/R20130213-0806/"/>
+</location>
+</locations>
+</target>
diff --git a/org.eclipse.rmf.releng.target/juno/pom.xml b/org.eclipse.rmf.releng.target/juno/pom.xml
new file mode 100644
index 0000000..3b27f52
--- /dev/null
+++ b/org.eclipse.rmf.releng.target/juno/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+		<groupId>org.eclipse.rmf</groupId>

+		<artifactId>org.eclipse.rmf.releng</artifactId>

+		<version>0.10.0-SNAPSHOT</version>

+		<relativePath>../../org.eclipse.rmf.releng/pom.xml</relativePath>

+	</parent>

+	<groupId>org.eclipse.rmf.releng.target</groupId>

+	<artifactId>juno</artifactId>

+	<version>0.10.0-SNAPSHOT</version>

+	<packaging>eclipse-target-definition</packaging>

+</project>

diff --git a/org.eclipse.rmf.releng.target/kepler/kepler.target b/org.eclipse.rmf.releng.target/kepler/kepler.target
new file mode 100644
index 0000000..77a43b3
--- /dev/null
+++ b/org.eclipse.rmf.releng.target/kepler/kepler.target
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="KEPLER_4_3_0" sequenceNumber="15">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.agilemore.agilegrid.feature.feature.group" version="1.3.3"/>
+<repository location="http://agilegrid.sourceforge.net/agilegrid/updatesite-rmf/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.poi" version="3.9.0.v201303080712"/>
+<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
+<unit id="com.google.guava" version="10.0.1.v201203051515"/>
+<unit id="org.junit" version="4.7.0.v4_7_0_v20130308-0411"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xsd.sdk.feature.group" version="2.9.1.v20130902-0605"/>
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.9.0.v20130828-0031"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.9.1.v20130911-1000"/>
+<unit id="org.eclipse.emf.compare.source.feature.group" version="2.1.1.201309031318"/>
+<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.7.0.201306111341"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.9.1.v20130902-0605"/>
+<repository location="http://download.eclipse.org/releases/kepler/"/>
+</location>
+</locations>
+</target>
diff --git a/org.eclipse.rmf.releng.target/kepler/pom.xml b/org.eclipse.rmf.releng.target/kepler/pom.xml
new file mode 100644
index 0000000..44c3a6b
--- /dev/null
+++ b/org.eclipse.rmf.releng.target/kepler/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+		<groupId>org.eclipse.rmf</groupId>

+		<artifactId>org.eclipse.rmf.releng</artifactId>

+		<version>0.10.0-SNAPSHOT</version>

+		<relativePath>../../org.eclipse.rmf.releng/pom.xml</relativePath>

+	</parent>

+	<groupId>org.eclipse.rmf.releng.target</groupId>

+	<artifactId>kepler</artifactId>

+	<version>0.10.0-SNAPSHOT</version>

+	<packaging>eclipse-target-definition</packaging>

+</project>

diff --git a/org.eclipse.rmf.examples.feature/notice.html b/org.eclipse.rmf.releng.target/notice.html
similarity index 97%
copy from org.eclipse.rmf.examples.feature/notice.html
copy to org.eclipse.rmf.releng.target/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.examples.feature/notice.html
+++ b/org.eclipse.rmf.releng.target/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.releng.target/pom.xml b/org.eclipse.rmf.releng.target/pom.xml
deleted file mode 100644
index 42b7f49..0000000
--- a/org.eclipse.rmf.releng.target/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project

-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"

-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<groupId>org.eclipse.rmf</groupId>

-		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

-		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

-	</parent>

-	<artifactId>org.eclipse.rmf.target</artifactId>

-	<packaging>pom</packaging>

-

-	<properties>

-		<build-helper-version>1.3</build-helper-version>

-	</properties>

-

-	<profiles>

-		<profile>

-			<id>INDIGO_3_7_2.target</id>

-			<build>

-				<plugins>

-					<plugin>

-						<groupId>org.codehaus.mojo</groupId>

-						<artifactId>build-helper-maven-plugin</artifactId>

-						<version>${build-helper-version}</version>

-						<executions>

-							<!-- make target file available for incremental builds -->

-							<execution>

-								<id>attach-artifacts</id>

-								<phase>package</phase>

-								<goals>

-									<goal>attach-artifact</goal>

-								</goals>

-								<configuration>

-									<artifacts>

-										<artifact>

-											<!-- note: the file name must be ${classifier}.target -->

-											<file>INDIGO_3_7_2.target</file>

-											<type>target</type>

-											<classifier>INDIGO_3_7_2</classifier>

-										</artifact>

-									</artifacts>

-								</configuration>

-							</execution>

-						</executions>

-					</plugin>

-				</plugins>

-			</build>

-		</profile>

-		<profile>

-			<id>JUNO_4_2_2.target</id>

-			<build>

-				<plugins>

-					<plugin>

-						<groupId>org.codehaus.mojo</groupId>

-						<artifactId>build-helper-maven-plugin</artifactId>

-						<version>${build-helper-version}</version>

-						<executions>

-							<!-- make target file available for incremental builds -->

-							<execution>

-								<id>attach-artifacts</id>

-								<phase>package</phase>

-								<goals>

-									<goal>attach-artifact</goal>

-								</goals>

-								<configuration>

-									<artifacts>

-										<artifact>

-											<!-- note: the file name must be ${classifier}.target -->

-											<file>JUNO_4_2_2.target</file>

-											<type>target</type>

-											<classifier>JUNO_4_2_2</classifier>

-										</artifact>

-									</artifacts>

-								</configuration>

-							</execution>

-						</executions>

-					</plugin>

-				</plugins>

-			</build>

-		</profile>

-		<profile>

-			<id>KEPLER_4_3_0.target</id>

-			<build>

-				<plugins>

-					<plugin>

-						<groupId>org.codehaus.mojo</groupId>

-						<artifactId>build-helper-maven-plugin</artifactId>

-						<version>${build-helper-version}</version>

-						<executions>

-							<!-- make target file available for incremental builds -->

-							<execution>

-								<id>attach-artifacts</id>

-								<phase>package</phase>

-								<goals>

-									<goal>attach-artifact</goal>

-								</goals>

-								<configuration>

-									<artifacts>

-										<artifact>

-											<!-- note: the file name must be ${classifier}.target -->

-											<file>KEPLER_4_3_0.target</file>

-											<type>target</type>

-											<classifier>KEPLER_4_3_0</classifier>

-										</artifact>

-									</artifacts>

-								</configuration>

-							</execution>

-						</executions>

-					</plugin>

-				</plugins>

-			</build>

-		</profile>

-	</profiles>

-</project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html b/org.eclipse.rmf.releng/about.html
similarity index 99%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
copy to org.eclipse.rmf.releng/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
+++ b/org.eclipse.rmf.releng/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/epl-v10.html b/org.eclipse.rmf.releng/epl-v10.html
similarity index 99%
copy from org.eclipse.rmf.examples.feature/epl-v10.html
copy to org.eclipse.rmf.releng/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.examples.feature/epl-v10.html
+++ b/org.eclipse.rmf.releng/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.releng/launcher/INDIGO_3_7_2.launch b/org.eclipse.rmf.releng/launcher/INDIGO_3_7_2.launch
index 3b8bcad..13032bc 100644
--- a/org.eclipse.rmf.releng/launcher/INDIGO_3_7_2.launch
+++ b/org.eclipse.rmf.releng/launcher/INDIGO_3_7_2.launch
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
 <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean verify"/>
+<stringAttribute key="M2_GOALS" value="clean verify -X"/>
 <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
 <booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="INDIGO_3_7_2.target"/>
+<stringAttribute key="M2_PROFILES" value="platform-indigo"/>
 <listAttribute key="M2_PROPERTIES"/>
 <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
 <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
diff --git a/org.eclipse.rmf.releng/launcher/JUNO_4_2_2.launch b/org.eclipse.rmf.releng/launcher/JUNO_4_2_2.launch
index e3e4fed..6fc6df5 100644
--- a/org.eclipse.rmf.releng/launcher/JUNO_4_2_2.launch
+++ b/org.eclipse.rmf.releng/launcher/JUNO_4_2_2.launch
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
 <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean install"/>
+<stringAttribute key="M2_GOALS" value="clean verify"/>
 <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
 <booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="JUNO_4_2_2.target"/>
+<stringAttribute key="M2_PROFILES" value="platform-juno"/>
 <listAttribute key="M2_PROPERTIES"/>
 <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
 <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
 <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
 <stringAttribute key="bad_container_name" value="/org.eclipse.rmf.releng/launcher"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.rmf.releng}"/>
 </launchConfiguration>
diff --git a/org.eclipse.rmf.releng/launcher/KEPLER_4_3_0.launch b/org.eclipse.rmf.releng/launcher/KEPLER_4_3_0.launch
new file mode 100644
index 0000000..e4fe2ef
--- /dev/null
+++ b/org.eclipse.rmf.releng/launcher/KEPLER_4_3_0.launch
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="clean verify"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value="platform-kepler"/>
+<listAttribute key="M2_PROPERTIES"/>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<stringAttribute key="bad_container_name" value="/org.eclipse.rmf.releng/launcher"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.rmf.releng}"/>
+</launchConfiguration>
diff --git a/org.eclipse.rmf.releng/launcher/PrepareForNextRelease.launch b/org.eclipse.rmf.releng/launcher/PrepareForNextRelease.launch
new file mode 100644
index 0000000..5d34dc7
--- /dev/null
+++ b/org.eclipse.rmf.releng/launcher/PrepareForNextRelease.launch
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="-Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=0.10.0-SNAPSHOT -Dplatform.version.name=indigo"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value=""/>
+<listAttribute key="M2_PROPERTIES"/>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<stringAttribute key="bad_container_name" value="/org.eclipse.rmf.releng/launcher"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.rmf.releng}"/>
+</launchConfiguration>
diff --git a/org.eclipse.rmf.examples.feature/notice.html b/org.eclipse.rmf.releng/notice.html
similarity index 97%
copy from org.eclipse.rmf.examples.feature/notice.html
copy to org.eclipse.rmf.releng/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.examples.feature/notice.html
+++ b/org.eclipse.rmf.releng/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.releng/pom.xml b/org.eclipse.rmf.releng/pom.xml
index bfe8930..46cf32a 100644
--- a/org.eclipse.rmf.releng/pom.xml
+++ b/org.eclipse.rmf.releng/pom.xml
@@ -1,23 +1,133 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<project

-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"

-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

 	<modelVersion>4.0.0</modelVersion>

+	<prerequisites>

+		<maven>3.0</maven>

+	</prerequisites>

 	<groupId>org.eclipse.rmf</groupId>

 	<artifactId>org.eclipse.rmf.releng</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

+	<version>0.10.0-SNAPSHOT</version>

 	<packaging>pom</packaging>

+	<name>RMF Parent</name>

+	<url>http://www.eclipse.org/rmf</url>

+	<description>RMF is a framework for working with textual requirements, structured as ReqIF models, the industry standard for exchanging requirements. RMF uses natively ReqIF, the open standard for requirements exchange.</description>

+	<licenses>

+		<license>

+			<name>Eclipse Public License v1.0</name>

+			<comments>

+       All rights reserved.

 

-	<!-- this is the parent POM from which all modules inherit common settings -->

+       This program and the accompanying materials are made

+       available under the terms of the Eclipse Public License v1.0

+       which accompanies this distribution, and is available at

+       http://www.eclipse.org/legal/epl-v10.htm

+			</comments>

+		</license>

+	</licenses>

+	<organization>

+		<name>Eclipse</name>

+		<url>http://www.eclipse.org</url>

+	</organization>

+	<scm>

+		

+	</scm>

+	<issueManagement>

+		<system>Eclipse Bugzilla</system>

+		<url>https://bugs.eclipse.org/bugs/enter_bug.cgi?product=MDT.RMF</url>

+	</issueManagement>

+	<ciManagement>

+		<url>https://hudson.eclipse.org/hudson/job/rmf-nightly/</url>

+		<system>Eclipse Hudson</system>

+	</ciManagement>

 	<properties>

-		<tycho-version>0.18.0</tycho-version>

-		<antrun-version>1.6</antrun-version>

+		<tycho.version>0.19.0</tycho.version>

+		<antrun.version>1.6</antrun.version>

+		<next.release>0.10.0-SNAPSHOT</next.release>

 	</properties>

+	<repositories>

+	<repository>

+      <id>license-feature</id>

+      <url>http://download.eclipse.org/cbi/updates/license/</url>

+      <layout>p2</layout>

+    </repository>

+    </repositories>

+    

+    

+    	<modules>

+		<module>../org.eclipse.rmf.releng.target/${platform.version.name}</module>

+		<module>../org.eclipse.rmf.releng.repository</module>

+		<module>../org.eclipse.rmf.releng.product</module>

 

+        <module>../org.agilemore.agilegrid</module>

+

+		<!-- ReqIF Core -->

+		<module>../org.eclipse.rmf.reqif10</module>

+		<module>../org.eclipse.rmf.reqif10.edit</module>

+		<module>../org.eclipse.rmf.reqif10.xhtml</module>

+		<module>../org.eclipse.rmf.reqif10.xhtml.edit</module>

+		<module>../org.eclipse.rmf.reqif10.common</module>

+		<module>../org.eclipse.rmf.reqif10.constraints</module>

+		<module>../org.eclipse.rmf.reqif10.serialization</module>

+		<module>../org.eclipse.rmf.serialization</module>

+		<module>../org.eclipse.rmf.reqif10.feature</module>

+		<module>../org.eclipse.rmf.reqif10.thirdparty.feature</module>

+		<module>../org.eclipse.rmf.reqif10.sdk.feature</module>

+		<module>../org.eclipse.rmf.tests.serialization</module>

+		<module>../org.eclipse.rmf.tests.reqif10.serialization</module>

+		<module>../org.eclipse.rmf.tests.reqif10.common</module>

+		<module>../org.eclipse.rmf.tests.reqif10.constraints</module>

+		<module>../org.eclipse.rmf.tests.reqif10.feature</module>

+

+		<!-- ReqIF UI ProR -->

+		<module>../org.eclipse.rmf.reqif10.pror</module>

+		<module>../org.eclipse.rmf.reqif10.pror.edit</module>

+		<module>../org.eclipse.rmf.reqif10.pror.editor</module>

+		<module>../org.eclipse.rmf.reqif10.pror.editor.tests</module>

+		<module>../org.eclipse.rmf.reqif10.pror.presentation.headline</module>

+		<module>../org.eclipse.rmf.reqif10.pror.presentation.id</module>

+		<module>../org.eclipse.rmf.reqif10.pror.presentation.linewrap</module>

+		<module>../org.eclipse.rmf.reqif10.pror.help.ui</module>

+		<module>../org.eclipse.rmf.reqif10.pror.genhtml</module>

+		<module>../org.eclipse.rmf.reqif10.pror.feature</module>

+		<module>../org.eclipse.rmf.reqif10.pror.sdk.feature</module>

+

+		<module>../org.eclipse.rmf.reqif10.pror.tests</module>

+		<!-- <module>../org.eclipse.rmf.reqif10.pror.presentation.id.tests</module> -->

+

+

+		<!-- RMF Examples Plugins -->

+		<module>../org.eclipse.rmf.examples.installer</module>

+		<module>../org.eclipse.rmf.examples.feature</module>

+

+

+		<!-- legacy plugins -->

+		<module>../org.eclipse.rmf.emf.ecore.converter</module>

+		<module>../org.eclipse.rmf.rif11.model</module>

+		<module>../org.eclipse.rmf.rif11.xsd.model</module>

+		<module>../org.eclipse.rmf.rif11.resource</module>

+		<!-- deactivated for kepler build <module>../org.eclipse.rmf.rif11.model.test</module> -->

+

+		<module>../org.eclipse.rmf.rif12.model</module>

+		<module>../org.eclipse.rmf.rif12.xsd.model</module>

+		<module>../org.eclipse.rmf.rif12.resource</module>

+		<!-- deactivated for kepler build <module>../org.eclipse.rmf.rif12.model.test</module> -->

+	</modules>

+

+

+	<pluginRepositories>

+		<pluginRepository>

+			<id>maven.eclipse.org</id>

+			<url>http://maven.eclipse.org/nexus/content/groups/public/</url>

+		</pluginRepository>

+	</pluginRepositories>

+    

+    

+    

 	<build>

+		<sourceDirectory>src</sourceDirectory>

 		<plugins>

-			<plugin>

-				<!-- Use compiler plugin with tycho as the adapter to the JDT compiler. -->

+		    <plugin>

 				<artifactId>maven-compiler-plugin</artifactId>

 				<version>3.1</version>

 				<configuration>

@@ -26,25 +136,17 @@
 					<compilerId>jdt</compilerId>

 				</configuration>

 				<dependencies>

-					<!-- This dependency provides the implementation of compiler "jdt": -->

 					<dependency>

 						<groupId>org.eclipse.tycho</groupId>

 						<artifactId>tycho-compiler-jdt</artifactId>

-						<version>${tycho-version}</version>

+						<version>${tycho.version}</version>

 					</dependency>

 				</dependencies>

 			</plugin>

 			<plugin>

-				<!-- enable tycho build extension -->

-				<groupId>org.eclipse.tycho</groupId>

-				<artifactId>tycho-maven-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<extensions>true</extensions>

-			</plugin>

-			<plugin>

 				<groupId>org.apache.maven.plugins</groupId>

 				<artifactId>maven-antrun-plugin</artifactId>

-				<version>${antrun-version}</version>

+				<version>${antrun.version}</version>

 				<executions>

 					<execution>

 						<id>replace-build-token</id>

@@ -125,232 +227,299 @@
 					</dependency>

 				</dependencies>

 			</plugin>

+			<plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-resources-plugin</artifactId>

+				<version>2.6</version>

+				<configuration>

+					<encoding>UTF-8</encoding>

+				</configuration>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-maven-plugin</artifactId>

+				<version>${tycho.version}</version>

+				<extensions>true</extensions>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>target-platform-configuration</artifactId>

+				<version>${tycho.version}</version>

+				<configuration>

+					<target>

+						<artifact>

+							<groupId>org.eclipse.rmf.releng.target</groupId>

+							<artifactId>${platform.version.name}</artifactId>

+							<version>0.10.0-SNAPSHOT</version>

+						</artifact>

+					</target>

+					<environments>

+						<environment>

+							<os>win32</os>

+							<ws>win32</ws>

+							<arch>x86</arch>

+						</environment>

+						<environment>

+							<os>win32</os>

+							<ws>win32</ws>

+							<arch>x86_64</arch>

+						</environment>

+						<environment>

+							<os>macosx</os>

+							<ws>cocoa</ws>

+							<arch>x86_64</arch>

+						</environment>

+						<environment>

+							<os>linux</os>

+							<ws>gtk</ws>

+							<arch>x86</arch>

+						</environment>

+						<environment>

+							<os>linux</os>

+							<ws>gtk</ws>

+							<arch>x86_64</arch>

+						</environment>

+					</environments>

+				</configuration>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-source-plugin</artifactId>

+				<version>${tycho.version}</version>

+				<executions>

+					<execution>

+						<id>plugin-source</id>

+						<goals>

+							<goal>plugin-source</goal>

+						</goals>

+					</execution>

+				</executions>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho.extras</groupId>

+				<artifactId>tycho-source-feature-plugin</artifactId>

+				<version>${tycho.version}</version>

+				<executions>

+					<execution>

+						<id>source-feature</id>

+						<phase>package</phase>

+						<goals>

+							<goal>source-feature</goal>

+						</goals>

+						<configuration>

+							<includeBinaryFeature>false</includeBinaryFeature>

+							<!-- Non-breakable space, as normal spaces are trimmed. -->

+							<labelSuffix>&nbsp;Source</labelSuffix>

+						</configuration>

+					</execution>

+				</executions>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-p2-plugin</artifactId>

+				<version>${tycho.version}</version>

+				<executions>

+					<execution>

+						<!-- Don't attach (default) metadata before the "generate-source-feature"

+							execution. -->

+						<id>default-p2-metadata-default</id>

+						<configuration>

+							<attachP2Metadata>false</attachP2Metadata>

+						</configuration>

+					</execution>

+					<execution>

+						<!-- Do attach metadata after the "generate-source-feature" execution. -->

+						<id>attach-p2-metadata</id>

+						<phase>package</phase>

+						<goals>

+							<goal>p2-metadata</goal>

+						</goals>

+					</execution>

+				</executions>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-surefire-plugin</artifactId>

+				<version>${tycho.version}</version>

+				<configuration>

+					<testFailureIgnore>true</testFailureIgnore>

+					<includes>

+						<include>**/*Test.java</include>

+						<include>**/*Test2.java</include>

+					</includes>

+					<excludes>

+						<!-- Test mojo matches TestProject be default and treats it as PojoTest -->

+						<exclude>**/Test*.class</exclude>

+					</excludes>

+					<useUIHarness>false</useUIHarness>

+					<useUIThread>false</useUIThread>

+					<argLine>${tycho.surefire.extra.vmargs}</argLine>

+

+					<!-- Uncomment to remote debug tests run by Maven/Tycho build -->

+					<!-- <argLine>${tycho.surefire.extra.vmargs} -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y</argLine> -->

+				</configuration>

+			</plugin>

 		</plugins>

 	</build>

 	<profiles>

-		<profile>

-			<id>INDIGO_3_7_2.target</id>

-			<build>

-				<plugins>

-					<plugin>

-						<groupId>org.eclipse.tycho</groupId>

-						<artifactId>target-platform-configuration</artifactId>

-						<version>${tycho-version}</version>

-						<configuration>

-							<!-- add target file content to target platform -->

-							<target>

-								<artifact>

-									<groupId>org.eclipse.rmf</groupId>

-									<artifactId>org.eclipse.rmf.target</artifactId>

-									<version>0.9.0-SNAPSHOT</version>

-									<classifier>INDIGO_3_7_2</classifier>

-								</artifact>

-							</target>

-							<environments>

-								<environment>

-									<os>linux</os>

-									<ws>gtk</ws>

-									<arch>x86</arch>

-								</environment>

-								<environment>

-									<os>linux</os>

-									<ws>gtk</ws>

-									<arch>x86_64</arch>

-								</environment>

-								<environment>

-									<os>win32</os>

-									<ws>win32</ws>

-									<arch>x86</arch>

-								</environment>

-								<environment>

-									<os>win32</os>

-									<ws>win32</ws>

-									<arch>x86_64</arch>

-								</environment>

-								<environment>

-									<os>macosx</os>

-									<ws>cocoa</ws>

-									<arch>x86_64</arch>

-								</environment>

-							</environments>

-						</configuration>

-					</plugin>

-				</plugins>

-			</build>

+	    <profile>

+			<id>platform-indigo</id>

+			<properties>

+				<platform.version.name>indigo</platform.version.name>

+			</properties>

 		</profile>

 		<profile>

-			<id>JUNO_4_2_2.target</id>

-			<build>

-				<plugins>

-					<plugin>

-						<groupId>org.eclipse.tycho</groupId>

-						<artifactId>target-platform-configuration</artifactId>

-						<version>${tycho-version}</version>

-						<configuration>

-							<!-- add target file content to target platform -->

-							<target>

-								<artifact>

-									<groupId>org.eclipse.rmf</groupId>

-									<artifactId>org.eclipse.rmf.target</artifactId>

-									<version>0.9.0-SNAPSHOT</version>

-									<classifier>JUNO_4_2_2</classifier>

-								</artifact>

-							</target>

-							<environments>

-								<environment>

-									<os>linux</os>

-									<ws>gtk</ws>

-									<arch>x86</arch>

-								</environment>

-								<environment>

-									<os>linux</os>

-									<ws>gtk</ws>

-									<arch>x86_64</arch>

-								</environment>

-								<environment>

-									<os>win32</os>

-									<ws>win32</ws>

-									<arch>x86</arch>

-								</environment>

-								<environment>

-									<os>win32</os>

-									<ws>win32</ws>

-									<arch>x86_64</arch>

-								</environment>

-								<environment>

-									<os>macosx</os>

-									<ws>cocoa</ws>

-									<arch>x86_64</arch>

-								</environment>

-							</environments>

-						</configuration>

-					</plugin>

-				</plugins>

-			</build>

+			<id>platform-juno</id>

+			<properties>

+				<platform.version.name>juno</platform.version.name>

+			</properties>

 		</profile>

 		<profile>

-			<id>KEPLER_4_3_0.target</id>

-			<build>

-				<plugins>

-					<plugin>

-						<groupId>org.eclipse.tycho</groupId>

-						<artifactId>target-platform-configuration</artifactId>

-						<version>${tycho-version}</version>

-						<configuration>

-							<!-- add target file content to target platform -->

-							<target>

-								<artifact>

-									<groupId>org.eclipse.rmf</groupId>

-									<artifactId>org.eclipse.rmf.target</artifactId>

-									<version>0.9.0-SNAPSHOT</version>

-									<classifier>KEPLER_4_3_0</classifier>

-								</artifact>

-							</target>

-							<environments>

-								<environment>

-									<os>linux</os>

-									<ws>gtk</ws>

-									<arch>x86</arch>

-								</environment>

-								<environment>

-									<os>linux</os>

-									<ws>gtk</ws>

-									<arch>x86_64</arch>

-								</environment>

-								<environment>

-									<os>win32</os>

-									<ws>win32</ws>

-									<arch>x86</arch>

-								</environment>

-								<environment>

-									<os>win32</os>

-									<ws>win32</ws>

-									<arch>x86_64</arch>

-								</environment>

-								<environment>

-									<os>macosx</os>

-									<ws>cocoa</ws>

-									<arch>x86_64</arch>

-								</environment>

-							</environments>

-						</configuration>

-					</plugin>

-				</plugins>

-			</build>

+			<id>platform-kepler</id>

+			<properties>

+				<platform.version.name>kepler</platform.version.name>

+			</properties>

 		</profile>

 		<profile>

-			<id>DEFAULT</id>

+			<id>platform-luna</id>

+			<properties>

+				<platform.version.name>luna</platform.version.name>

+			</properties>

+		</profile>

+		<profile>

+			<id>os-macosx</id>

 			<activation>

-				<property>

-					<name>!NEW_SERIALIZATION</name>

-				</property>

+				<os>

+					<family>mac</family>

+				</os>

 			</activation>

-			<modules>

-				<module>../org.eclipse.rmf.releng.target</module>

-				<module>../org.eclipse.rmf.releng.repository</module>

-				<module>../org.eclipse.rmf.releng.product</module>

-

-				<!-- ReqIF Core -->

-				<module>../org.eclipse.rmf.reqif10</module>

-				<module>../org.eclipse.rmf.reqif10.edit</module>

-				<module>../org.eclipse.rmf.reqif10.xhtml</module>

-				<module>../org.eclipse.rmf.reqif10.xhtml.edit</module>

-				<module>../org.eclipse.rmf.reqif10.common</module>

-				<module>../org.eclipse.rmf.reqif10.serialization</module>

-				<module>../org.eclipse.rmf.serialization</module>

-				<module>../org.eclipse.rmf.reqif10.feature</module>

-				<module>../org.eclipse.rmf.reqif10.thirdparty.feature</module>

-				<module>../org.eclipse.rmf.reqif10.sdk.feature</module>

-				<module>../org.eclipse.rmf.tests.serialization</module>

-				<module>../org.eclipse.rmf.tests.reqif10.serialization</module>

-				<module>../org.eclipse.rmf.tests.reqif10.common</module>

-				<module>../org.eclipse.rmf.tests.reqif10.feature</module>

-

-				<!-- ReqIF UI ProR -->

-				<module>../org.eclipse.rmf.reqif10.pror</module>

-				<module>../org.eclipse.rmf.reqif10.pror.edit</module>

-				<module>../org.eclipse.rmf.reqif10.pror.editor</module>

-				<module>../org.eclipse.rmf.reqif10.pror.editor.tests</module>

-				<module>../org.eclipse.rmf.reqif10.pror.presentation.headline</module>

-				<module>../org.eclipse.rmf.reqif10.pror.presentation.id</module>

-				<module>../org.eclipse.rmf.reqif10.pror.presentation.linewrap</module>

-				<module>../org.eclipse.rmf.reqif10.pror.help.ui</module>

-				<module>../org.eclipse.rmf.reqif10.pror.genhtml</module>

-				<module>../org.eclipse.rmf.reqif10.pror.feature</module>

-				<module>../org.eclipse.rmf.reqif10.pror.sdk.feature</module>

-

-				<module>../org.eclipse.rmf.reqif10.pror.tests</module>

-				<!-- <module>../org.eclipse.rmf.reqif10.pror.presentation.id.tests</module> -->

-

-

-				<!-- RMF Examples Plugins -->

-				<module>../org.eclipse.rmf.examples.installer</module>

-				<module>../org.eclipse.rmf.examples.feature</module>

-

-

-				<!-- legacy plugins -->

-				<module>../org.eclipse.rmf.emf.ecore.converter</module>

-				<module>../org.eclipse.rmf.rif11.model</module>

-				<module>../org.eclipse.rmf.rif11.xsd.model</module>

-				<module>../org.eclipse.rmf.rif11.resource</module>

-				<!-- deactivated for kepler build <module>../org.eclipse.rmf.rif11.model.test</module> -->

-

-				<module>../org.eclipse.rmf.rif12.model</module>

-				<module>../org.eclipse.rmf.rif12.xsd.model</module>

-				<module>../org.eclipse.rmf.rif12.resource</module>

-				<!-- deactivated for kepler build <module>../org.eclipse.rmf.rif12.model.test</module> -->

-			</modules>

-

+			<properties>

+				<!-- !!! Important Note !!! The following element MUST be written in a single line. Otherwise the build will fail under Max OS X

+				(see https://bugs.eclipse.org/bugs/show_bug.cgi?id=427693). In particular, be careful when auto formatting this file with Ctrl+Shift+F

+				as it tends to break up this line into several pieces. -->

+				<tycho.surefire.extra.vmargs>-Xmx512m -XX:MaxPermSize=256m -XstartOnFirstThread</tycho.surefire.extra.vmargs>

+			</properties>

 		</profile>

+		<profile>

+			<id>os-other</id>

+			<activation>

+				<os>

+					<family>!mac</family>

+				</os>

+			</activation>

+			<properties>

+				<tycho.surefire.extra.vmargs>-Xmx512m -XX:MaxPermSize=256m</tycho.surefire.extra.vmargs>

+			</properties>

+		</profile>

+	

+		<profile>

+			<id>eclipse-sign</id>

 

+			<pluginRepositories>

+				<pluginRepository>

+					<id>m2e-cbi</id>

+					<url>http://download.eclipse.org/technology/m2e/maven/</url>

+				</pluginRepository>

+			</pluginRepositories>

 

+			<build>

+				<plugins>

+					<plugin>

+						<groupId>org.eclipse.tycho</groupId>

+						<artifactId>target-platform-configuration</artifactId>

+						<version>${tycho.version}</version>

+						<configuration>

+							<includePackedArtifacts>true</includePackedArtifacts>

+						</configuration>

+					</plugin>

+					<plugin>

+						<groupId>org.eclipse.tycho.extras</groupId>

+						<artifactId>tycho-pack200a-plugin</artifactId>

+						<version>${tycho.version}</version>

+						<executions>

+							<execution>

+								<id>pack200-normalize</id>

+								<goals>

+									<goal>normalize</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+					<plugin>

+						<groupId>org.eclipse.cbi.maven.plugins</groupId>

+						<artifactId>eclipse-jarsigner-plugin</artifactId>

+						<version>1.0.1</version>

+						<executions>

+							<execution>

+								<id>sign</id>

+								<goals>

+									<goal>sign</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+					<plugin>

+						<groupId>org.eclipse.tycho.extras</groupId>

+						<artifactId>tycho-pack200b-plugin</artifactId>

+						<version>${tycho.version}</version>

+						<executions>

+							<execution>

+								<id>pack200-pack</id>

+								<goals>

+									<goal>pack</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+					<plugin>

+						<groupId>org.eclipse.tycho</groupId>

+						<artifactId>tycho-p2-plugin</artifactId>

+						<version>${tycho.version}</version>

+						<executions>

+							<execution>

+								<id>p2-metadata</id>

+								<phase>package</phase>

+								<goals>

+									<goal>p2-metadata</goal>

+								</goals>

+							</execution>

+						</executions>

+						<configuration>

+							<defaultP2Metadata>false</defaultP2Metadata>

+						</configuration>

+					</plugin>

+				</plugins>

+			</build>

+		</profile>

+	    <profile>

+		<id>prepare-for-next-release</id>

+		<activation>

+			<activeByDefault>false</activeByDefault>

+		</activation>

+		<build>

+			<defaultGoal>org.eclipse.tycho:tycho-versions-plugin:set-version</defaultGoal>

+			<plugins>

+				<plugin>

+					<groupId>org.eclipse.tycho</groupId>

+					<artifactId>tycho-versions-plugin</artifactId>

+					<version>${tycho.version}</version>

+					<executions>

+						<execution>

+							<id>change-next-release</id>

+							<goals>

+								<goal>set-version</goal>

+							</goals>

+						</execution>

+					</executions>

+					<configuration>

+				 

+						<newVersion>${next.release}</newVersion>

+				

+						<!--  <newVersion>0.10.0</newVersion> -->

+					</configuration>

+				</plugin>

+			</plugins>

+		</build>

+	</profile>

 	</profiles>

-

-	<pluginRepositories>

-		<pluginRepository>

-			<id>maven.eclipse.org</id>

-			<url>http://maven.eclipse.org/nexus/content/groups/public/</url>

-		</pluginRepository>

-	</pluginRepositories>

-

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.common/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.common/META-INF/MANIFEST.MF
index 6cb37bc..f4798fe 100644
--- a/org.eclipse.rmf.reqif10.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.common/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rmf.reqif10.common
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-Activator: org.eclipse.rmf.reqif10.internal.common.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rmf.reqif10;bundle-version="0.9.0",
diff --git a/org.eclipse.rmf.reqif10.common/about.html b/org.eclipse.rmf.reqif10.common/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.common/about.html
+++ b/org.eclipse.rmf.reqif10.common/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.common/build.properties b/org.eclipse.rmf.reqif10.common/build.properties
index 73e5f89..5724df5 100644
--- a/org.eclipse.rmf.reqif10.common/build.properties
+++ b/org.eclipse.rmf.reqif10.common/build.properties
@@ -1,3 +1,13 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
diff --git a/org.eclipse.rmf.reqif10.common/epl-v10.html b/org.eclipse.rmf.reqif10.common/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.reqif10.common/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.common/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.common/notice.html b/org.eclipse.rmf.reqif10.common/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.reqif10.common/notice.html
+++ b/org.eclipse.rmf.reqif10.common/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.common/plugin.properties b/org.eclipse.rmf.reqif10.common/plugin.properties
index 683ff46..6a30911 100644
--- a/org.eclipse.rmf.reqif10.common/plugin.properties
+++ b/org.eclipse.rmf.reqif10.common/plugin.properties
@@ -1,11 +1,13 @@
-# Copyright (c) 2012 itemis GmbH.
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # Contributors:
-#     Mark Broerkens - initial API and implementation
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 
 pluginName = RMF Core ReqIF Common (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/org.eclipse.rmf.reqif10.common/pom.xml b/org.eclipse.rmf.reqif10.common/pom.xml
index 8d83776..a28dc54 100644
--- a/org.eclipse.rmf.reqif10.common/pom.xml
+++ b/org.eclipse.rmf.reqif10.common/pom.xml
@@ -19,31 +19,13 @@
 	<parent>
 		<groupId>org.eclipse.rmf</groupId>
 		<artifactId>org.eclipse.rmf.releng</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.10.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.rmf.reqif10.common</artifactId>
-	<version>0.9.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.rmf.plugins</groupId>
 	<properties>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   	</properties>
- 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>plugin-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIF10Util.java b/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIF10Util.java
index c739f2e..8f51711 100644
--- a/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIF10Util.java
+++ b/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIF10Util.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2013 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -11,9 +11,13 @@
  ******************************************************************************/

 package org.eclipse.rmf.reqif10.common.util;

 

+import java.text.DateFormat;

+import java.text.ParseException;

 import java.util.Collection;

+import java.util.Date;

 import java.util.GregorianCalendar;

 

+import javax.xml.datatype.DatatypeConfigurationException;

 import javax.xml.datatype.XMLGregorianCalendar;

 

 import org.eclipse.emf.common.util.EList;

@@ -404,4 +408,14 @@
 

 	}

 

+	/**

+	 * Helper that converts String to {@link XMLGregorianCalendar}. We use this for Validation and for setting.

+	 */

+	public static GregorianCalendar stingToCalendar(String value) throws ParseException, DatatypeConfigurationException {

+		Date date = DateFormat.getDateInstance().parse(value.toString());

+		GregorianCalendar cal = new GregorianCalendar();

+		cal.setTime(date);

+		return cal;

+	}

+

 }
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIF10XHtmlContentAdapter.java b/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIF10XHtmlContentAdapter.java
index 1fad74e..b55e747 100644
--- a/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIF10XHtmlContentAdapter.java
+++ b/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIF10XHtmlContentAdapter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIF10XHtmlContentAdapterFactory.java b/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIF10XHtmlContentAdapterFactory.java
index 92ba63b..6b0ef17 100644
--- a/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIF10XHtmlContentAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIF10XHtmlContentAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIF10XhtmlUtil.java b/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIF10XhtmlUtil.java
index 98720d6..f96530c 100644
--- a/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIF10XhtmlUtil.java
+++ b/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIF10XhtmlUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf and others.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  * Contributors:

  *     Michael Jastram - initial API and implementation

  *     Lukas Ladenberger - ProR GUI 

- *     Mark Broerkens - Xhtml access methods   

+ *     Mark Broerkens (itemis AG)- Xhtml access methods   

  ******************************************************************************/

 package org.eclipse.rmf.reqif10.common.util;

 

@@ -22,8 +22,12 @@
 import org.eclipse.emf.ecore.xmi.XMLResource;

 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

 import org.eclipse.rmf.reqif10.XhtmlContent;

+import org.eclipse.rmf.reqif10.xhtml.XhtmlDivType;

+import org.eclipse.rmf.reqif10.xhtml.XhtmlPType;

 import org.w3c.dom.Document;

 

+;

+

 /**

  * Static helper class with methods for ReqIF Xhtml content.

  * 

diff --git a/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIFToolExtensionUtil.java b/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIFToolExtensionUtil.java
index 5edd626..e6097e8 100644
--- a/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIFToolExtensionUtil.java
+++ b/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/common/util/ReqIFToolExtensionUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2011, 2014 Formal Mind GmbH and University of Dusseldorf and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,19 +24,14 @@
 import org.eclipse.rmf.reqif10.ReqIF10Factory;
 import org.eclipse.rmf.reqif10.ReqIFToolExtension;
 
+/**
+ * {@link ReqIFToolExtension} in ReqIF models are special, as tools may insert their own models. This class contains a
+ * number of static helper methods that helps dealing with them.
+ */
 public class ReqIFToolExtensionUtil {
-	public static List<ReqIFToolExtension> getReqIFToolExtensions(ReqIF reqIF) {
-		final List<ReqIFToolExtension> reqIFToolExtensions;
-		if (null != reqIF) {
-			reqIFToolExtensions = reqIF.getToolExtensions();
-		} else {
-			reqIFToolExtensions = new ArrayList<ReqIFToolExtension>();
-		}
-		return reqIFToolExtensions;
-	}
 
 	public static List<EObject> getToolExtensionsByNsURI(ReqIF reqIF, String nsURI) {
-		final List<ReqIFToolExtension> reqIFToolExtensions = getReqIFToolExtensions(reqIF);
+		final List<ReqIFToolExtension> reqIFToolExtensions = reqIF.getToolExtensions();
 		List<EObject> toolExtensions = new ArrayList<EObject>();
 		for (ReqIFToolExtension reqIFToolExtension : reqIFToolExtensions) {
 			for (EObject extension : reqIFToolExtension.getExtensions()) {
@@ -50,7 +45,7 @@
 
 	@SuppressWarnings("unchecked")
 	public static <T> List<T> getToolExtensionsByType(ReqIF reqIF, EClassifier type) {
-		final List<ReqIFToolExtension> reqIFToolExtensions = getReqIFToolExtensions(reqIF);
+		final List<ReqIFToolExtension> reqIFToolExtensions = reqIF.getToolExtensions();
 		List<T> toolExtensions = new ArrayList<T>();
 		for (ReqIFToolExtension reqIFToolExtension : reqIFToolExtensions) {
 			for (EObject extension : reqIFToolExtension.getExtensions()) {
diff --git a/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/internal/common/Activator.java b/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/internal/common/Activator.java
index aac1d46..9d67329 100644
--- a/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/internal/common/Activator.java
+++ b/org.eclipse.rmf.reqif10.common/src/org/eclipse/rmf/reqif10/internal/common/Activator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.classpath b/org.eclipse.rmf.reqif10.constraints/.classpath
similarity index 99%
rename from org.eclipse.rmf.reqif10.pror.presentation.id.tests/.classpath
rename to org.eclipse.rmf.reqif10.constraints/.classpath
index 304e861..64c5e31 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.classpath
+++ b/org.eclipse.rmf.reqif10.constraints/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.gitignore b/org.eclipse.rmf.reqif10.constraints/.gitignore
similarity index 100%
rename from org.eclipse.rmf.reqif10.pror.presentation.id.tests/.gitignore
rename to org.eclipse.rmf.reqif10.constraints/.gitignore
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.project b/org.eclipse.rmf.reqif10.constraints/.project
similarity index 90%
rename from org.eclipse.rmf.reqif10.pror.presentation.id.tests/.project
rename to org.eclipse.rmf.reqif10.constraints/.project
index 0032b4b..2535750 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.project
+++ b/org.eclipse.rmf.reqif10.constraints/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.rmf.reqif10.pror.presentation.id.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.rmf.reqif10.constraints</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.core.resources.prefs b/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..845273e
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1

+encoding//design/default.ecore=UTF-8

+encoding//design/resources.ecore_diagram=UTF-8

+encoding/<project>=UTF-8

diff --git a/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..3aa46d1
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,372 @@
+#Thu Apr 12 17:16:12 CEST 2012

+eclipse.preferences.version=1

+org.eclipse.jdt.core.codeComplete.argumentPrefixes=

+org.eclipse.jdt.core.codeComplete.argumentSuffixes=

+org.eclipse.jdt.core.codeComplete.fieldPrefixes=

+org.eclipse.jdt.core.codeComplete.fieldSuffixes=

+org.eclipse.jdt.core.codeComplete.localPrefixes=

+org.eclipse.jdt.core.codeComplete.localSuffixes=

+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=

+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=

+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=

+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

+org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.debug.lineNumber=generate

+org.eclipse.jdt.core.compiler.debug.localVariable=generate

+org.eclipse.jdt.core.compiler.debug.sourceFile=generate

+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore

+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning

+org.eclipse.jdt.core.compiler.problem.deadCode=warning

+org.eclipse.jdt.core.compiler.problem.deprecation=warning

+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning

+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore

+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled

+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore

+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning

+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error

+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning

+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled

+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore

+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore

+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore

+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning

+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning

+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore

+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning

+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled

+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore

+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning

+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning

+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning

+org.eclipse.jdt.core.compiler.problem.nullReference=ignore

+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning

+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore

+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore

+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore

+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning

+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore

+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore

+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore

+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore

+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore

+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning

+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled

+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled

+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning

+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled

+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning

+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning

+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning

+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled

+org.eclipse.jdt.core.compiler.problem.unusedImport=warning

+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning

+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore

+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled

+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled

+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

+org.eclipse.jdt.core.compiler.source=1.5

+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_assignment=0

+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_after_package=1

+org.eclipse.jdt.core.formatter.blank_lines_before_field=0

+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

+org.eclipse.jdt.core.formatter.blank_lines_before_method=1

+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

+org.eclipse.jdt.core.formatter.blank_lines_before_package=0

+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true

+org.eclipse.jdt.core.formatter.comment.format_block_comments=true

+org.eclipse.jdt.core.formatter.comment.format_header=false

+org.eclipse.jdt.core.formatter.comment.format_html=true

+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false

+org.eclipse.jdt.core.formatter.comment.format_line_comments=true

+org.eclipse.jdt.core.formatter.comment.format_source_code=true

+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

+org.eclipse.jdt.core.formatter.comment.line_length=120

+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

+org.eclipse.jdt.core.formatter.compact_else_if=true

+org.eclipse.jdt.core.formatter.continuation_indentation=2

+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_empty_lines=false

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

+org.eclipse.jdt.core.formatter.indentation.size=4

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.join_lines_in_comments=true

+org.eclipse.jdt.core.formatter.join_wrapped_lines=true

+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.lineSplit=150

+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1

+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

+org.eclipse.jdt.core.formatter.tabulation.char=tab

+org.eclipse.jdt.core.formatter.tabulation.size=4

+org.eclipse.jdt.core.formatter.use_on_off_tags=false

+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..94bcd86
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,120 @@
+#Wed Apr 04 18:47:36 CEST 2012
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_to_enhanced_for_loop=true
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=false
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=false
+cleanup.remove_unused_private_types=false
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=_Unmanaged profile 'RMF'
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_RMF
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * &lt;copyright&gt;\n * \n * Copyright (c) {contributing company name} and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n * \n * Contributors\: \n *     {contributing company name} - Initial API and implementation\n * \n * &lt;/copyright&gt;\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/*\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=true
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=false
+sp_cleanup.remove_unused_private_types=false
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..ac5f8a2
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Wed Apr 04 18:47:53 CEST 2012
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.pde.prefs b/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..546490c
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,33 @@
+#Wed Apr 04 18:47:36 CEST 2012
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=2
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=2
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.wst.xml.core.prefs b/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.wst.xml.core.prefs
new file mode 100644
index 0000000..2f885f5
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.constraints/.settings/org.eclipse.wst.xml.core.prefs
@@ -0,0 +1,18 @@
+#Wed Apr 04 18:48:00 CEST 2012
+attributeHasNoValue=2
+eclipse.preferences.version=1
+endTagWithAttributes=2
+honourAllSchemaLocations=true
+indicateNoGrammar=1
+indiciateNoDocumentElement=-1
+markupValidation=true
+missingClosingBracket=2
+missingClosingQuote=2
+missingEndTag=2
+missingQuotes=2
+missingStartTag=2
+missingTagName=2
+namespaceInPITarget=2
+whitespaceAtStart=2
+whitespaceBeforeTagName=2
+xinclude=true
diff --git a/org.eclipse.rmf.reqif10.constraints/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.constraints/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..ec1fe7d
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.constraints/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.rmf.reqif10.constraints;singleton:=true
+Bundle-Version: 0.10.0.qualifier
+Bundle-Activator: org.eclipse.rmf.internal.reqif10.constraints.Activator
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.validation;visibility:=reexport,
+ org.eclipse.rmf.reqif10
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.rmf.reqif10.constraints
+Bundle-Vendor: %providerName
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html b/org.eclipse.rmf.reqif10.constraints/about.html
similarity index 99%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
copy to org.eclipse.rmf.reqif10.constraints/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
+++ b/org.eclipse.rmf.reqif10.constraints/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.constraints/build.properties b/org.eclipse.rmf.reqif10.constraints/build.properties
new file mode 100644
index 0000000..4948bb5
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.constraints/build.properties
@@ -0,0 +1,19 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               epl-v10.html,\
+               notice.html,\
+               plugin.properties
diff --git a/org.eclipse.rmf.examples.feature/epl-v10.html b/org.eclipse.rmf.reqif10.constraints/epl-v10.html
similarity index 99%
copy from org.eclipse.rmf.examples.feature/epl-v10.html
copy to org.eclipse.rmf.reqif10.constraints/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.examples.feature/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.constraints/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/notice.html b/org.eclipse.rmf.reqif10.constraints/notice.html
similarity index 97%
copy from org.eclipse.rmf.examples.feature/notice.html
copy to org.eclipse.rmf.reqif10.constraints/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.examples.feature/notice.html
+++ b/org.eclipse.rmf.reqif10.constraints/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.constraints/plugin.properties b/org.eclipse.rmf.reqif10.constraints/plugin.properties
new file mode 100644
index 0000000..2473f44
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.constraints/plugin.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
+
+pluginName = RMF Core ReqIF Constraints (Incubation)
+providerName = Eclipse Modeling Project
diff --git a/org.eclipse.rmf.reqif10.constraints/plugin.xml b/org.eclipse.rmf.reqif10.constraints/plugin.xml
new file mode 100644
index 0000000..d03a6e2
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.constraints/plugin.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.emf.validation.constraintProviders">
+      <category
+            id="org.eclipse.rmf.reqif10.constraints"
+            mandatory="false"
+            name="Constraints for ReqIF 1.0">
+      Constraints for validating ReqIF 1.0 models
+      </category>
+      <constraintProvider
+            cache="true"
+            mode="Batch">
+         <package
+               namespaceUri="http://www.omg.org/spec/ReqIF/20110401/reqif.xsd">
+         </package>
+         <constraints categories="org.eclipse.rmf.reqif10.constraints">
+         <constraint
+                  class="org.eclipse.rmf.reqif10.constraints.IdentifiableLongNameExistenceConstraint"
+                  id="C1.1"
+                  lang="JAVA"
+                  mode="Batch"
+                  name="C1.1 EnumValue - existence of long name"
+                  severity="ERROR"
+                  statusCode="0101">
+               <message>
+                  LongName is not set
+               </message>
+               <description>
+                  LongName of EnumValue must be set
+               </description>
+               <target
+                     class="EnumValue">
+               </target>
+         </constraint>
+         <constraint
+                  class="org.eclipse.rmf.reqif10.constraints.IdentifiableLongNameExistenceConstraint"
+                  id="C1.2"
+                  lang="JAVA"
+                  mode="Batch"
+                  name="C1.1 AttributeDefinitionBoolean - existence of long name"
+                  severity="ERROR"
+                  statusCode="0102">
+               <message>
+                  LongName is not set
+               </message>
+               <description>
+                  LongName of AttributeDefinitionBoolean must be set
+               </description>
+               <target
+                     class="AttributeDefinitionBoolean">
+               </target>
+            </constraint>
+         <constraint
+                  class="org.eclipse.rmf.reqif10.constraints.IdentifiableLongNameExistenceConstraint"
+                  id="C1.3"
+                  lang="JAVA"
+                  mode="Batch"
+                  name="C1.3 AttributeDefinitionDate - existence of long name"
+                  severity="ERROR"
+                  statusCode="0103">
+               <message>
+                  LongName is not set
+               </message>
+               <description>
+                  LongName of AttributeDefinitionDate must be set
+               </description>
+               <target
+                     class="AttributeDefinitionDate">
+               </target>
+            </constraint>
+         <constraint
+                  class="org.eclipse.rmf.reqif10.constraints.IdentifiableLongNameExistenceConstraint"
+                  id="C1.4"
+                  lang="JAVA"
+                  mode="Batch"
+                  name="C1.4 AttributeDefinitionEnumeration - existence of long name"
+                  severity="ERROR"
+                  statusCode="0104">
+               <message>
+                  LongName is not set
+               </message>
+               <description>
+                  LongName of AttributeDefinitionEnumeration must be set
+               </description>
+               <target
+                     class="AttributeDefinitionEnumeration">
+               </target>
+            </constraint>
+         <constraint
+                  class="org.eclipse.rmf.reqif10.constraints.IdentifiableLongNameExistenceConstraint"
+                  id="C1.5"
+                  lang="JAVA"
+                  mode="Batch"
+                  name="C1.5 AttributeDefinitionInteger - existence of long name"
+                  severity="ERROR"
+                  statusCode="0105">
+               <message>
+                  LongName is not set
+               </message>
+               <description>
+                  LongName of AttributeDefinitionInteger must be set
+               </description>
+               <target
+                     class="AttributeDefinitionInteger">
+               </target>
+            </constraint>
+         <constraint
+                  class="org.eclipse.rmf.reqif10.constraints.IdentifiableLongNameExistenceConstraint"
+                  id="C1.6"
+                  lang="JAVA"
+                  mode="Batch"
+                  name="C1.6 AttributeDefinitionReal - existence of long name"
+                  severity="ERROR"
+                  statusCode="0106">
+               <message>
+                  LongName is not set
+               </message>
+               <description>
+                  LongName of AttributeDefinitionReal must be set
+               </description>
+               <target
+                     class="AttributeDefinitionReal">
+               </target>
+            </constraint>
+         <constraint
+                  class="org.eclipse.rmf.reqif10.constraints.IdentifiableLongNameExistenceConstraint"
+                  id="C1.7"
+                  lang="JAVA"
+                  mode="Batch"
+                  name="C1.7 AttributeDefinitionString - existence of long name"
+                  severity="ERROR"
+                  statusCode="0107">
+               <message>
+                  LongName is not set
+               </message>
+               <description>
+                  LongName of AttributeDefinitionString must be set
+               </description>
+               <target
+                     class="AttributeDefinitionString">
+               </target>
+            </constraint>
+         <constraint
+                  class="org.eclipse.rmf.reqif10.constraints.IdentifiableLongNameExistenceConstraint"
+                  id="C1.8"
+                  lang="JAVA"
+                  mode="Batch"
+                  name="C1.8 AttributeDefinitionXHTML - existence of long name"
+                  severity="ERROR"
+                  statusCode="0108">
+               <message>
+                  LongName is not set
+               </message>
+               <description>
+                  LongName of AttributeDefinitionXHTML must be set
+               </description>
+               <target
+                     class="AttributeDefinitionXHTML">
+               </target>
+            </constraint>
+         <constraint
+                  class="org.eclipse.rmf.reqif10.constraints.IdentifiableLongNameExistenceConstraint"
+                  id="C1.9"
+                  lang="JAVA"
+                  mode="Batch"
+                  name="C1.9 RelationGroup - existence of long name"
+                  severity="ERROR"
+                  statusCode="0109">
+               <message>
+                  LongName is not set
+               </message>
+               <description>
+                  LongName of RelationGroup must be set
+               </description>
+               <target
+                     class="RelationGroup">
+               </target>
+            </constraint>
+            <constraint
+                  class="org.eclipse.rmf.reqif10.constraints.EnumerationMultiplicityConstraint"
+                  id="C2.1"
+                  lang="JAVA"
+                  mode="Batch"
+                  name="C2.1 Number of Attribute Values"
+                  severity="ERROR"
+                  statusCode="0201">
+               <message>
+                  {1}
+               </message>
+               <description>
+                  Number of values in AttributeValueEnumeration shall correspond to its AttributeDefinitionEnumeration
+               </description>
+               <target
+                     class="AttributeValueEnumeration">
+               </target>
+            </constraint>
+         </constraints>
+      </constraintProvider>
+   </extension>
+   
+   <!-- to be moved into user application -->
+   <extension point="org.eclipse.emf.validation.constraintBindings">    
+        <binding
+            context="EObjectContext"
+            category="org.eclipse.rmf.reqif10.constraints"/>
+   </extension>
+   
+   <extension point="org.eclipse.emf.validation.constraintBindings">
+        <clientContext id="EObjectContext">
+            <enablement>
+                <instanceof value="org.eclipse.emf.ecore.EObject"/>
+            </enablement>
+        </clientContext>
+   </extension>
+
+</plugin>
diff --git a/org.eclipse.rmf.reqif10.constraints/pom.xml b/org.eclipse.rmf.reqif10.constraints/pom.xml
new file mode 100644
index 0000000..ab133f4
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.constraints/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ <copyright>
+Copyright (c) 2012 itemis AG.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+
+Contributors:
+    Mark Broerkens - initial API and implementation
+ </copyright>
+
+-->
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+    <parent>
+		<groupId>org.eclipse.rmf</groupId>
+		<artifactId>org.eclipse.rmf.releng</artifactId>
+		<version>0.10.0-SNAPSHOT</version>
+		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.eclipse.rmf.reqif10.constraints</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	<groupId>org.eclipse.rmf.plugins</groupId>
+</project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.constraints/src/org/eclipse/rmf/internal/reqif10/constraints/Activator.java b/org.eclipse.rmf.reqif10.constraints/src/org/eclipse/rmf/internal/reqif10/constraints/Activator.java
new file mode 100644
index 0000000..3b92b61
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.constraints/src/org/eclipse/rmf/internal/reqif10/constraints/Activator.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.rmf.internal.reqif10.constraints;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+	private static BundleContext context;
+
+	static BundleContext getContext() {
+		return context;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext bundleContext) throws Exception {
+		Activator.context = bundleContext;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext bundleContext) throws Exception {
+		Activator.context = null;
+	}
+
+}
diff --git a/org.eclipse.rmf.reqif10.constraints/src/org/eclipse/rmf/reqif10/constraints/IdentifiableLongNameExistenceConstraint.java b/org.eclipse.rmf.reqif10.constraints/src/org/eclipse/rmf/reqif10/constraints/IdentifiableLongNameExistenceConstraint.java
new file mode 100644
index 0000000..8cc8b2f
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.constraints/src/org/eclipse/rmf/reqif10/constraints/IdentifiableLongNameExistenceConstraint.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.rmf.reqif10.constraints;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.validation.AbstractModelConstraint;
+import org.eclipse.emf.validation.IValidationContext;
+import org.eclipse.rmf.reqif10.Identifiable;
+
+public class IdentifiableLongNameExistenceConstraint extends AbstractModelConstraint {
+
+	@Override
+	public IStatus validate(IValidationContext ctx) {
+		Object target = ctx.getTarget();
+
+		if (target != null && target instanceof Identifiable) {
+			Identifiable identifiable = (Identifiable) target;
+			String longName = identifiable.getLongName();
+			if (!identifiable.isSetLongName() || null == longName || "".equals(longName)) { //$NON-NLS-1$
+				return ctx.createFailureStatus();
+			} else {
+				return Status.OK_STATUS;
+			}
+		} else {
+			return Status.OK_STATUS;
+		}
+	}
+}
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.edit/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.edit/META-INF/MANIFEST.MF
index fbadd74..a3659fd 100644
--- a/org.eclipse.rmf.reqif10.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rmf.reqif10.edit;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.rmf.reqif10.provider.Reqif10EditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.rmf.reqif10.edit/about.html b/org.eclipse.rmf.reqif10.edit/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.edit/about.html
+++ b/org.eclipse.rmf.reqif10.edit/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.edit/build.properties b/org.eclipse.rmf.reqif10.edit/build.properties
index dc0632b..a1e9beb 100644
--- a/org.eclipse.rmf.reqif10.edit/build.properties
+++ b/org.eclipse.rmf.reqif10.edit/build.properties
@@ -1,12 +1,13 @@
-# Copyright (c) 2012 itemis AG.
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
-# 
+#
 # Contributors:
-#     Mark Broerkens - initial API and implementation
-# 
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 
 bin.includes = .,\
                META-INF/,\
diff --git a/org.eclipse.rmf.reqif10.edit/epl-v10.html b/org.eclipse.rmf.reqif10.edit/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.reqif10.edit/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.edit/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionBoolean.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionBoolean.gif
index c3370c7..2bf90f5 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionBoolean.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionBoolean.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionDate.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionDate.gif
index ed87474..2bf90f5 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionDate.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionDate.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionEnumeration.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionEnumeration.gif
index 10d2229..2bf90f5 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionEnumeration.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionEnumeration.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionInteger.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionInteger.gif
index a26660e..2bf90f5 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionInteger.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionInteger.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionReal.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionReal.gif
index 420eee1..2bf90f5 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionReal.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionReal.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionString.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionString.gif
index 48e3cf2..2bf90f5 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionString.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionString.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionXHTML.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionXHTML.gif
index 94c953e..2bf90f5 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionXHTML.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeDefinitionXHTML.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueBoolean.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueBoolean.gif
index caf2804..d8c13a4 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueBoolean.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueBoolean.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueDate.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueDate.gif
index 48e3cf2..d8c13a4 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueDate.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueDate.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueEnumeration.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueEnumeration.gif
index 420eee1..d8c13a4 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueEnumeration.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueEnumeration.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueInteger.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueInteger.gif
index 7c2aaac..d8c13a4 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueInteger.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueInteger.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueReal.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueReal.gif
index e4b530e..d8c13a4 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueReal.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueReal.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueString.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueString.gif
index 10d2229..d8c13a4 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueString.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueString.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueXHTML.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueXHTML.gif
index 89ad5da..d8c13a4 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueXHTML.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/AttributeValueXHTML.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionBoolean.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionBoolean.gif
index 53500da..27ca735 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionBoolean.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionBoolean.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionDate.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionDate.gif
index 2b69256..27ca735 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionDate.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionDate.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionEnumeration.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionEnumeration.gif
index ef56c14..6c6d3ae 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionEnumeration.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionEnumeration.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionInteger.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionInteger.gif
index afb82ea..27ca735 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionInteger.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionInteger.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionReal.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionReal.gif
index e4bc22d..27ca735 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionReal.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionReal.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionString.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionString.gif
index 98b351f..27ca735 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionString.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionString.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionXHTML.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionXHTML.gif
index 05dc74a..27ca735 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionXHTML.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/DatatypeDefinitionXHTML.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/EmbeddedValue.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/EmbeddedValue.gif
index 33854e9..67d30e1 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/EmbeddedValue.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/EmbeddedValue.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/EnumValue.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/EnumValue.gif
index 98b351f..67d30e1 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/EnumValue.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/EnumValue.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/ReqIF.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/ReqIF.gif
index 338fb8d..09810ab 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/ReqIF.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/ReqIF.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/ReqIFContent.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/ReqIFContent.gif
index 4365960..306baff 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/ReqIFContent.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/ReqIFContent.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/ReqIFHeader.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/ReqIFHeader.gif
index 83afb9b..a4412af 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/ReqIFHeader.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/ReqIFHeader.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/ReqIFToolExtension.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/ReqIFToolExtension.gif
index 2b69256..306ebc6 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/ReqIFToolExtension.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/ReqIFToolExtension.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecHierarchy.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecHierarchy.gif
index 9041598..e3c6286 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecHierarchy.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecHierarchy.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecObject.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecObject.gif
index 136e3b2..489fd99 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecObject.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecObject.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecObjectType.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecObjectType.gif
index e4b530e..9bbe10e 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecObjectType.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecObjectType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecRelation.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecRelation.gif
index cb1755a..5a85429 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecRelation.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecRelation.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecRelationType.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecRelationType.gif
index c00aedf..9bbe10e 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecRelationType.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecRelationType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/Specification.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/Specification.gif
index 2b69256..137fa2c 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/Specification.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/Specification.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecificationType.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecificationType.gif
index 90d10f9..9bbe10e 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecificationType.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/SpecificationType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/XhtmlContent.gif b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/XhtmlContent.gif
index ef56c14..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.edit/icons/full/obj16/XhtmlContent.gif
+++ b/org.eclipse.rmf.reqif10.edit/icons/full/obj16/XhtmlContent.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.edit/notice.html b/org.eclipse.rmf.reqif10.edit/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.reqif10.edit/notice.html
+++ b/org.eclipse.rmf.reqif10.edit/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.edit/plugin.properties b/org.eclipse.rmf.reqif10.edit/plugin.properties
index 815bf83..c06e3ea 100644
--- a/org.eclipse.rmf.reqif10.edit/plugin.properties
+++ b/org.eclipse.rmf.reqif10.edit/plugin.properties
@@ -1,11 +1,13 @@
-# Copyright (c) 2013 itemis GmbH.
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # Contributors:
-#     Mark Broerkens - initial API and implementation
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 
 pluginName = RMF Core ReqIF Edit (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/org.eclipse.rmf.reqif10.edit/pom.xml b/org.eclipse.rmf.reqif10.edit/pom.xml
index 6a77876..2566b92 100644
--- a/org.eclipse.rmf.reqif10.edit/pom.xml
+++ b/org.eclipse.rmf.reqif10.edit/pom.xml
@@ -19,31 +19,13 @@
 	<parent>
 		<groupId>org.eclipse.rmf</groupId>
 		<artifactId>org.eclipse.rmf.releng</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.10.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.rmf.reqif10.edit</artifactId>
-	<version>0.9.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.rmf.plugins</groupId>
 	<properties>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   	</properties>
- 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>plugin-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AccessControlledElementItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AccessControlledElementItemProvider.java
index e70d81d..bb44077 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AccessControlledElementItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AccessControlledElementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -32,23 +31,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AccessControlledElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AccessControlledElement} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AccessControlledElementItemProvider
-	extends IdentifiableItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AccessControlledElementItemProvider extends IdentifiableItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AccessControlledElementItemProvider(AdapterFactory adapterFactory) {
@@ -56,9 +48,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -72,46 +63,36 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Editable feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Editable feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addEditablePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AccessControlledElement_editable_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AccessControlledElement_editable_feature", "_UI_AccessControlledElement_type"),
-				 ReqIF10Package.Literals.ACCESS_CONTROLLED_ELEMENT__EDITABLE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(),
+				getString("_UI_AccessControlledElement_editable_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AccessControlledElement_editable_feature", "_UI_AccessControlledElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.ACCESS_CONTROLLED_ELEMENT__EDITABLE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null,
+				null));
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((AccessControlledElement)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AccessControlledElement_type") :
-			getString("_UI_AccessControlledElement_type") + " " + label;
+		String label = ((AccessControlledElement) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_AccessControlledElement_type") : //$NON-NLS-1$
+				getString("_UI_AccessControlledElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -119,18 +100,17 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AccessControlledElement.class)) {
-			case ReqIF10Package.ACCESS_CONTROLLED_ELEMENT__EDITABLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		case ReqIF10Package.ACCESS_CONTROLLED_ELEMENT__EDITABLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AlternativeIDItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AlternativeIDItemProvider.java
index 3179ede..b669134 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AlternativeIDItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AlternativeIDItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -35,23 +34,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AlternativeID} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AlternativeID} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AlternativeIDItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AlternativeIDItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AlternativeIDItemProvider(AdapterFactory adapterFactory) {
@@ -59,9 +51,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -75,57 +66,44 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Identifier feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Identifier feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdentifierPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AlternativeID_identifier_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AlternativeID_identifier_feature", "_UI_AlternativeID_type"),
-				 ReqIF10Package.Literals.ALTERNATIVE_ID__IDENTIFIER,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AlternativeID_identifier_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AlternativeID_identifier_feature", "_UI_AlternativeID_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.ALTERNATIVE_ID__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This returns AlternativeID.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns AlternativeID.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AlternativeID"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AlternativeID")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((AlternativeID)object).getIdentifier();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AlternativeID_type") :
-			getString("_UI_AlternativeID_type") + " " + label;
+		String label = ((AlternativeID) object).getIdentifier();
+		return label == null || label.length() == 0 ? getString("_UI_AlternativeID_type") : //$NON-NLS-1$
+				getString("_UI_AlternativeID_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -133,18 +111,17 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AlternativeID.class)) {
-			case ReqIF10Package.ALTERNATIVE_ID__IDENTIFIER:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		case ReqIF10Package.ALTERNATIVE_ID__IDENTIFIER:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -153,9 +130,8 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionBooleanItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionBooleanItemProvider.java
index 2eff798..375b009 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionBooleanItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionBooleanItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -34,23 +33,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeDefinitionBooleanItemProvider
-	extends AttributeDefinitionSimpleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeDefinitionBooleanItemProvider extends AttributeDefinitionSimpleItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionBooleanItemProvider(AdapterFactory adapterFactory) {
@@ -58,9 +50,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,33 +65,26 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeDefinitionBoolean_type_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeDefinitionBoolean_type_feature", "_UI_AttributeDefinitionBoolean_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_BOOLEAN__TYPE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_AttributeDefinitionBoolean_type_feature"), //$NON-NLS-1$
+						getString(
+								"_UI_PropertyDescriptor_description", "_UI_AttributeDefinitionBoolean_type_feature", "_UI_AttributeDefinitionBoolean_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+						ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_BOOLEAN__TYPE, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,8 +97,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -126,35 +110,32 @@
 	}
 
 	/**
-	 * This returns AttributeDefinitionBoolean.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns AttributeDefinitionBoolean.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeDefinitionBoolean"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeDefinitionBoolean")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((AttributeDefinitionBoolean)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AttributeDefinitionBoolean_type") :
-			getString("_UI_AttributeDefinitionBoolean_type") + " " + label;
+		String label = ((AttributeDefinitionBoolean) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_AttributeDefinitionBoolean_type") : //$NON-NLS-1$
+				getString("_UI_AttributeDefinitionBoolean_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -162,28 +143,25 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AttributeDefinitionBoolean.class)) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueBoolean()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE,
+				ReqIF10Factory.eINSTANCE.createAttributeValueBoolean()));
 	}
 
 }
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionDateItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionDateItemProvider.java
index 0cefa64..383fc51 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionDateItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionDateItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -34,23 +33,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionDate} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionDate} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeDefinitionDateItemProvider
-	extends AttributeDefinitionSimpleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeDefinitionDateItemProvider extends AttributeDefinitionSimpleItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionDateItemProvider(AdapterFactory adapterFactory) {
@@ -58,9 +50,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,33 +65,23 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeDefinitionDate_type_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeDefinitionDate_type_feature", "_UI_AttributeDefinitionDate_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_DATE__TYPE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AttributeDefinitionDate_type_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AttributeDefinitionDate_type_feature", "_UI_AttributeDefinitionDate_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_DATE__TYPE, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,8 +94,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -126,35 +107,32 @@
 	}
 
 	/**
-	 * This returns AttributeDefinitionDate.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns AttributeDefinitionDate.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeDefinitionDate"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeDefinitionDate")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((AttributeDefinitionDate)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AttributeDefinitionDate_type") :
-			getString("_UI_AttributeDefinitionDate_type") + " " + label;
+		String label = ((AttributeDefinitionDate) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_AttributeDefinitionDate_type") : //$NON-NLS-1$
+				getString("_UI_AttributeDefinitionDate_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -162,28 +140,25 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AttributeDefinitionDate.class)) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueDate()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE,
+				ReqIF10Factory.eINSTANCE.createAttributeValueDate()));
 	}
 
 }
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionEnumerationItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionEnumerationItemProvider.java
index 6eaf69d..afb1d57 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionEnumerationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionEnumerationItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -35,23 +34,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeDefinitionEnumerationItemProvider
-	extends AttributeDefinitionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeDefinitionEnumerationItemProvider extends AttributeDefinitionItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionEnumerationItemProvider(AdapterFactory adapterFactory) {
@@ -59,9 +51,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,55 +67,43 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Multi Valued feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Multi Valued feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMultiValuedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeDefinitionEnumeration_multiValued_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeDefinitionEnumeration_multiValued_feature", "_UI_AttributeDefinitionEnumeration_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(
+						((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_AttributeDefinitionEnumeration_multiValued_feature"), //$NON-NLS-1$
+						getString(
+								"_UI_PropertyDescriptor_description", "_UI_AttributeDefinitionEnumeration_multiValued_feature", "_UI_AttributeDefinitionEnumeration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+						ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED, true, false, false,
+						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeDefinitionEnumeration_type_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeDefinitionEnumeration_type_feature", "_UI_AttributeDefinitionEnumeration_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_ENUMERATION__TYPE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_AttributeDefinitionEnumeration_type_feature"), //$NON-NLS-1$
+						getString(
+								"_UI_PropertyDescriptor_description", "_UI_AttributeDefinitionEnumeration_type_feature", "_UI_AttributeDefinitionEnumeration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+						ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_ENUMERATION__TYPE, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -137,8 +116,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -150,35 +129,32 @@
 	}
 
 	/**
-	 * This returns AttributeDefinitionEnumeration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns AttributeDefinitionEnumeration.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeDefinitionEnumeration"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeDefinitionEnumeration")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((AttributeDefinitionEnumeration)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AttributeDefinitionEnumeration_type") :
-			getString("_UI_AttributeDefinitionEnumeration_type") + " " + label;
+		String label = ((AttributeDefinitionEnumeration) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_AttributeDefinitionEnumeration_type") : //$NON-NLS-1$
+				getString("_UI_AttributeDefinitionEnumeration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -186,31 +162,28 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AttributeDefinitionEnumeration.class)) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueEnumeration()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE,
+				ReqIF10Factory.eINSTANCE.createAttributeValueEnumeration()));
 	}
 
 }
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionIntegerItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionIntegerItemProvider.java
index aa9eed9..cea48a2 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionIntegerItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionIntegerItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -34,23 +33,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeDefinitionIntegerItemProvider
-	extends AttributeDefinitionSimpleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeDefinitionIntegerItemProvider extends AttributeDefinitionSimpleItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionIntegerItemProvider(AdapterFactory adapterFactory) {
@@ -58,9 +50,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,33 +65,26 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeDefinitionInteger_type_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeDefinitionInteger_type_feature", "_UI_AttributeDefinitionInteger_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_INTEGER__TYPE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_AttributeDefinitionInteger_type_feature"), //$NON-NLS-1$
+						getString(
+								"_UI_PropertyDescriptor_description", "_UI_AttributeDefinitionInteger_type_feature", "_UI_AttributeDefinitionInteger_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+						ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_INTEGER__TYPE, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,8 +97,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -126,35 +110,32 @@
 	}
 
 	/**
-	 * This returns AttributeDefinitionInteger.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns AttributeDefinitionInteger.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeDefinitionInteger"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeDefinitionInteger")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((AttributeDefinitionInteger)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AttributeDefinitionInteger_type") :
-			getString("_UI_AttributeDefinitionInteger_type") + " " + label;
+		String label = ((AttributeDefinitionInteger) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_AttributeDefinitionInteger_type") : //$NON-NLS-1$
+				getString("_UI_AttributeDefinitionInteger_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -162,28 +143,25 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AttributeDefinitionInteger.class)) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueInteger()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE,
+				ReqIF10Factory.eINSTANCE.createAttributeValueInteger()));
 	}
 
 }
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionItemProvider.java
index 81b1825..5106dd2 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -28,23 +27,16 @@
 import org.eclipse.rmf.reqif10.AttributeDefinition;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinition} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinition} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeDefinitionItemProvider
-	extends AccessControlledElementItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeDefinitionItemProvider extends AccessControlledElementItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +44,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,24 +58,22 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((AttributeDefinition)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AttributeDefinition_type") :
-			getString("_UI_AttributeDefinition_type") + " " + label;
+		String label = ((AttributeDefinition) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_AttributeDefinition_type") : //$NON-NLS-1$
+				getString("_UI_AttributeDefinition_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -94,10 +83,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionRealItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionRealItemProvider.java
index 4dec8df..44a2aa1 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionRealItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionRealItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -34,23 +33,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionReal} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionReal} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeDefinitionRealItemProvider
-	extends AttributeDefinitionSimpleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeDefinitionRealItemProvider extends AttributeDefinitionSimpleItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionRealItemProvider(AdapterFactory adapterFactory) {
@@ -58,9 +50,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,33 +65,23 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeDefinitionReal_type_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeDefinitionReal_type_feature", "_UI_AttributeDefinitionReal_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_REAL__TYPE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AttributeDefinitionReal_type_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AttributeDefinitionReal_type_feature", "_UI_AttributeDefinitionReal_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_REAL__TYPE, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,8 +94,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -126,35 +107,32 @@
 	}
 
 	/**
-	 * This returns AttributeDefinitionReal.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns AttributeDefinitionReal.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeDefinitionReal"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeDefinitionReal")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((AttributeDefinitionReal)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AttributeDefinitionReal_type") :
-			getString("_UI_AttributeDefinitionReal_type") + " " + label;
+		String label = ((AttributeDefinitionReal) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_AttributeDefinitionReal_type") : //$NON-NLS-1$
+				getString("_UI_AttributeDefinitionReal_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -162,28 +140,25 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AttributeDefinitionReal.class)) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueReal()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE,
+				ReqIF10Factory.eINSTANCE.createAttributeValueReal()));
 	}
 
 }
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionSimpleItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionSimpleItemProvider.java
index e92f2ac..4814b10 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionSimpleItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionSimpleItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -28,23 +27,16 @@
 import org.eclipse.rmf.reqif10.AttributeDefinitionSimple;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionSimple} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionSimple} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeDefinitionSimpleItemProvider
-	extends AttributeDefinitionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeDefinitionSimpleItemProvider extends AttributeDefinitionItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionSimpleItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +44,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,24 +58,22 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((AttributeDefinitionSimple)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AttributeDefinitionSimple_type") :
-			getString("_UI_AttributeDefinitionSimple_type") + " " + label;
+		String label = ((AttributeDefinitionSimple) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_AttributeDefinitionSimple_type") : //$NON-NLS-1$
+				getString("_UI_AttributeDefinitionSimple_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -94,10 +83,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionStringItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionStringItemProvider.java
index e2b2301..0533e0c 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionStringItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionStringItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -34,23 +33,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionString} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionString} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeDefinitionStringItemProvider
-	extends AttributeDefinitionSimpleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeDefinitionStringItemProvider extends AttributeDefinitionSimpleItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionStringItemProvider(AdapterFactory adapterFactory) {
@@ -58,9 +50,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,33 +65,23 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeDefinitionString_type_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeDefinitionString_type_feature", "_UI_AttributeDefinitionString_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_STRING__TYPE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AttributeDefinitionString_type_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AttributeDefinitionString_type_feature", "_UI_AttributeDefinitionString_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_STRING__TYPE, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,8 +94,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -126,35 +107,32 @@
 	}
 
 	/**
-	 * This returns AttributeDefinitionString.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns AttributeDefinitionString.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeDefinitionString"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeDefinitionString")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((AttributeDefinitionString)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AttributeDefinitionString_type") :
-			getString("_UI_AttributeDefinitionString_type") + " " + label;
+		String label = ((AttributeDefinitionString) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_AttributeDefinitionString_type") : //$NON-NLS-1$
+				getString("_UI_AttributeDefinitionString_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -162,28 +140,25 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AttributeDefinitionString.class)) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueString()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE,
+				ReqIF10Factory.eINSTANCE.createAttributeValueString()));
 	}
 
 }
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionXHTMLItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionXHTMLItemProvider.java
index 58dab0a..9612db9 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionXHTMLItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionXHTMLItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -34,23 +33,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeDefinitionXHTMLItemProvider
-	extends AttributeDefinitionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeDefinitionXHTMLItemProvider extends AttributeDefinitionItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionXHTMLItemProvider(AdapterFactory adapterFactory) {
@@ -58,9 +50,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,33 +65,23 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeDefinitionXHTML_type_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeDefinitionXHTML_type_feature", "_UI_AttributeDefinitionXHTML_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_XHTML__TYPE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AttributeDefinitionXHTML_type_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AttributeDefinitionXHTML_type_feature", "_UI_AttributeDefinitionXHTML_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_XHTML__TYPE, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,8 +94,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -126,35 +107,32 @@
 	}
 
 	/**
-	 * This returns AttributeDefinitionXHTML.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns AttributeDefinitionXHTML.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeDefinitionXHTML"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeDefinitionXHTML")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((AttributeDefinitionXHTML)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AttributeDefinitionXHTML_type") :
-			getString("_UI_AttributeDefinitionXHTML_type") + " " + label;
+		String label = ((AttributeDefinitionXHTML) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_AttributeDefinitionXHTML_type") : //$NON-NLS-1$
+				getString("_UI_AttributeDefinitionXHTML_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -162,28 +140,25 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AttributeDefinitionXHTML.class)) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueXHTML()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE,
+				ReqIF10Factory.eINSTANCE.createAttributeValueXHTML()));
 	}
 
 }
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueBooleanItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueBooleanItemProvider.java
index 6d715aa..1f1dee3 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueBooleanItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueBooleanItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -32,23 +31,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueBoolean} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueBoolean} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeValueBooleanItemProvider
-	extends AttributeValueSimpleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeValueBooleanItemProvider extends AttributeValueSimpleItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeValueBooleanItemProvider(AdapterFactory adapterFactory) {
@@ -56,9 +48,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,77 +64,57 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the The Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the The Value feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTheValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeValueBoolean_theValue_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueBoolean_theValue_feature", "_UI_AttributeValueBoolean_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(),
+				getString("_UI_AttributeValueBoolean_theValue_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueBoolean_theValue_feature", "_UI_AttributeValueBoolean_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null,
+				null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Definition feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Definition feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDefinitionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeValueBoolean_definition_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueBoolean_definition_feature", "_UI_AttributeValueBoolean_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_VALUE_BOOLEAN__DEFINITION,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AttributeValueBoolean_definition_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueBoolean_definition_feature", "_UI_AttributeValueBoolean_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.ATTRIBUTE_VALUE_BOOLEAN__DEFINITION, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This returns AttributeValueBoolean.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns AttributeValueBoolean.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeValueBoolean"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeValueBoolean")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		AttributeValueBoolean attributeValueBoolean = (AttributeValueBoolean)object;
-		return getString("_UI_AttributeValueBoolean_type") + " " + attributeValueBoolean.isTheValue();
+		AttributeValueBoolean attributeValueBoolean = (AttributeValueBoolean) object;
+		return getString("_UI_AttributeValueBoolean_type") + " " + attributeValueBoolean.isTheValue(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -151,18 +122,17 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AttributeValueBoolean.class)) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueDateItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueDateItemProvider.java
index ccc1bd4..00d165f 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueDateItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueDateItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,16 +11,12 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.GregorianCalendar;
 import java.util.List;
 
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -30,28 +26,20 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.rmf.reqif10.AttributeValueDate;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueDate} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueDate} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeValueDateItemProvider
-	extends AttributeValueSimpleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeValueDateItemProvider extends AttributeValueSimpleItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeValueDateItemProvider(AdapterFactory adapterFactory) {
@@ -59,9 +47,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,80 +63,57 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the The Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the The Value feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTheValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeValueDate_theValue_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueDate_theValue_feature", "_UI_AttributeValueDate_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_VALUE_DATE__THE_VALUE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AttributeValueDate_theValue_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueDate_theValue_feature", "_UI_AttributeValueDate_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.ATTRIBUTE_VALUE_DATE__THE_VALUE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Definition feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Definition feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDefinitionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeValueDate_definition_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueDate_definition_feature", "_UI_AttributeValueDate_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_VALUE_DATE__DEFINITION,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AttributeValueDate_definition_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueDate_definition_feature", "_UI_AttributeValueDate_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.ATTRIBUTE_VALUE_DATE__DEFINITION, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This returns AttributeValueDate.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns AttributeValueDate.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeValueDate"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeValueDate")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		GregorianCalendar labelValue = ((AttributeValueDate)object).getTheValue();
+		GregorianCalendar labelValue = ((AttributeValueDate) object).getTheValue();
 		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AttributeValueDate_type") :
-			getString("_UI_AttributeValueDate_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_AttributeValueDate_type") : //$NON-NLS-1$
+				getString("_UI_AttributeValueDate_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -157,18 +121,17 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AttributeValueDate.class)) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_DATE__THE_VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_DATE__THE_VALUE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueEnumerationItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueEnumerationItemProvider.java
index fa3a351..e32a4df 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueEnumerationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueEnumerationItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -29,23 +28,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueEnumeration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueEnumeration} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeValueEnumerationItemProvider
-	extends AttributeValueItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeValueEnumerationItemProvider extends AttributeValueItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeValueEnumerationItemProvider(AdapterFactory adapterFactory) {
@@ -53,9 +45,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -70,76 +61,60 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Values feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Values feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addValuesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeValueEnumeration_values_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueEnumeration_values_feature", "_UI_AttributeValueEnumeration_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_VALUE_ENUMERATION__VALUES,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_AttributeValueEnumeration_values_feature"), //$NON-NLS-1$
+						getString(
+								"_UI_PropertyDescriptor_description", "_UI_AttributeValueEnumeration_values_feature", "_UI_AttributeValueEnumeration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+						ReqIF10Package.Literals.ATTRIBUTE_VALUE_ENUMERATION__VALUES, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Definition feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Definition feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDefinitionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeValueEnumeration_definition_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueEnumeration_definition_feature", "_UI_AttributeValueEnumeration_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_VALUE_ENUMERATION__DEFINITION,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_AttributeValueEnumeration_definition_feature"), //$NON-NLS-1$
+						getString(
+								"_UI_PropertyDescriptor_description", "_UI_AttributeValueEnumeration_definition_feature", "_UI_AttributeValueEnumeration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+						ReqIF10Package.Literals.ATTRIBUTE_VALUE_ENUMERATION__DEFINITION, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This returns AttributeValueEnumeration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns AttributeValueEnumeration.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeValueEnumeration"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeValueEnumeration")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_AttributeValueEnumeration_type");
+		return getString("_UI_AttributeValueEnumeration_type"); //$NON-NLS-1$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -149,10 +124,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueIntegerItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueIntegerItemProvider.java
index 08e8945..050704c 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueIntegerItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueIntegerItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.math.BigInteger;
 
 import java.util.Collection;
@@ -34,23 +33,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueInteger} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueInteger} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeValueIntegerItemProvider
-	extends AttributeValueSimpleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeValueIntegerItemProvider extends AttributeValueSimpleItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeValueIntegerItemProvider(AdapterFactory adapterFactory) {
@@ -58,9 +50,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -75,80 +66,59 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the The Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the The Value feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTheValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeValueInteger_theValue_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueInteger_theValue_feature", "_UI_AttributeValueInteger_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_VALUE_INTEGER__THE_VALUE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(),
+				getString("_UI_AttributeValueInteger_theValue_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueInteger_theValue_feature", "_UI_AttributeValueInteger_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.ATTRIBUTE_VALUE_INTEGER__THE_VALUE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
+				null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Definition feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Definition feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDefinitionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeValueInteger_definition_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueInteger_definition_feature", "_UI_AttributeValueInteger_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_VALUE_INTEGER__DEFINITION,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AttributeValueInteger_definition_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueInteger_definition_feature", "_UI_AttributeValueInteger_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.ATTRIBUTE_VALUE_INTEGER__DEFINITION, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This returns AttributeValueInteger.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns AttributeValueInteger.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeValueInteger"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeValueInteger")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		BigInteger labelValue = ((AttributeValueInteger)object).getTheValue();
+		BigInteger labelValue = ((AttributeValueInteger) object).getTheValue();
 		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AttributeValueInteger_type") :
-			getString("_UI_AttributeValueInteger_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_AttributeValueInteger_type") : //$NON-NLS-1$
+				getString("_UI_AttributeValueInteger_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -156,18 +126,17 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AttributeValueInteger.class)) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__THE_VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__THE_VALUE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueItemProvider.java
index 8049b95..dc850fa 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -29,23 +28,16 @@
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValue} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValue} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeValueItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeValueItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeValueItemProvider(AdapterFactory adapterFactory) {
@@ -53,9 +45,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -68,21 +59,20 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_AttributeValue_type");
+		return getString("_UI_AttributeValue_type"); //$NON-NLS-1$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -92,10 +82,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -104,9 +93,8 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueRealItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueRealItemProvider.java
index ffd0ff2..09846a6 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueRealItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueRealItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -32,23 +31,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueReal} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueReal} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeValueRealItemProvider
-	extends AttributeValueSimpleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeValueRealItemProvider extends AttributeValueSimpleItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeValueRealItemProvider(AdapterFactory adapterFactory) {
@@ -56,9 +48,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,77 +64,55 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the The Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the The Value feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTheValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeValueReal_theValue_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueReal_theValue_feature", "_UI_AttributeValueReal_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_VALUE_REAL__THE_VALUE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AttributeValueReal_theValue_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueReal_theValue_feature", "_UI_AttributeValueReal_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.ATTRIBUTE_VALUE_REAL__THE_VALUE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Definition feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Definition feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDefinitionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeValueReal_definition_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueReal_definition_feature", "_UI_AttributeValueReal_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_VALUE_REAL__DEFINITION,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AttributeValueReal_definition_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueReal_definition_feature", "_UI_AttributeValueReal_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.ATTRIBUTE_VALUE_REAL__DEFINITION, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This returns AttributeValueReal.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns AttributeValueReal.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeValueReal"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeValueReal")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		AttributeValueReal attributeValueReal = (AttributeValueReal)object;
-		return getString("_UI_AttributeValueReal_type") + " " + attributeValueReal.getTheValue();
+		AttributeValueReal attributeValueReal = (AttributeValueReal) object;
+		return getString("_UI_AttributeValueReal_type") + " " + attributeValueReal.getTheValue(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -151,18 +120,17 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AttributeValueReal.class)) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_REAL__THE_VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_REAL__THE_VALUE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueSimpleItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueSimpleItemProvider.java
index 1239400..a1052e7 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueSimpleItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueSimpleItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -26,23 +25,16 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueSimple} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueSimple} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeValueSimpleItemProvider
-	extends AttributeValueItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeValueSimpleItemProvider extends AttributeValueItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeValueSimpleItemProvider(AdapterFactory adapterFactory) {
@@ -50,9 +42,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -65,21 +56,20 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_AttributeValueSimple_type");
+		return getString("_UI_AttributeValueSimple_type"); //$NON-NLS-1$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,10 +79,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueStringItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueStringItemProvider.java
index 369b026..7695073 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueStringItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueStringItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -32,23 +31,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueString} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueString} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeValueStringItemProvider
-	extends AttributeValueSimpleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeValueStringItemProvider extends AttributeValueSimpleItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeValueStringItemProvider(AdapterFactory adapterFactory) {
@@ -56,9 +48,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,79 +64,60 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the The Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the The Value feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTheValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeValueString_theValue_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueString_theValue_feature", "_UI_AttributeValueString_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_VALUE_STRING__THE_VALUE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(
+						((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_AttributeValueString_theValue_feature"), //$NON-NLS-1$
+						getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueString_theValue_feature", "_UI_AttributeValueString_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+						ReqIF10Package.Literals.ATTRIBUTE_VALUE_STRING__THE_VALUE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+						null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Definition feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Definition feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDefinitionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeValueString_definition_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueString_definition_feature", "_UI_AttributeValueString_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_VALUE_STRING__DEFINITION,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AttributeValueString_definition_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueString_definition_feature", "_UI_AttributeValueString_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.ATTRIBUTE_VALUE_STRING__DEFINITION, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This returns AttributeValueString.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns AttributeValueString.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeValueString"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeValueString")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((AttributeValueString)object).getTheValue();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AttributeValueString_type") :
-			getString("_UI_AttributeValueString_type") + " " + label;
+		String label = ((AttributeValueString) object).getTheValue();
+		return label == null || label.length() == 0 ? getString("_UI_AttributeValueString_type") : //$NON-NLS-1$
+				getString("_UI_AttributeValueString_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -153,18 +125,17 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AttributeValueString.class)) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_STRING__THE_VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_STRING__THE_VALUE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueXHTMLItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueXHTMLItemProvider.java
index 79d359d..0aaa344 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueXHTMLItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/AttributeValueXHTMLItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -35,23 +34,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueXHTML} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueXHTML} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class AttributeValueXHTMLItemProvider
-	extends AttributeValueItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class AttributeValueXHTMLItemProvider extends AttributeValueItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeValueXHTMLItemProvider(AdapterFactory adapterFactory) {
@@ -59,9 +51,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,55 +67,39 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Simplified feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Simplified feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSimplifiedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeValueXHTML_simplified_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueXHTML_simplified_feature", "_UI_AttributeValueXHTML_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_VALUE_XHTML__SIMPLIFIED,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(
+						((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_AttributeValueXHTML_simplified_feature"), //$NON-NLS-1$
+						getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueXHTML_simplified_feature", "_UI_AttributeValueXHTML_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+						ReqIF10Package.Literals.ATTRIBUTE_VALUE_XHTML__SIMPLIFIED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+						null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Definition feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Definition feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDefinitionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AttributeValueXHTML_definition_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueXHTML_definition_feature", "_UI_AttributeValueXHTML_type"),
-				 ReqIF10Package.Literals.ATTRIBUTE_VALUE_XHTML__DEFINITION,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AttributeValueXHTML_definition_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AttributeValueXHTML_definition_feature", "_UI_AttributeValueXHTML_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.ATTRIBUTE_VALUE_XHTML__DEFINITION, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -138,8 +113,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -151,33 +126,31 @@
 	}
 
 	/**
-	 * This returns AttributeValueXHTML.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns AttributeValueXHTML.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeValueXHTML"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeValueXHTML")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		AttributeValueXHTML attributeValueXHTML = (AttributeValueXHTML)object;
-		return getString("_UI_AttributeValueXHTML_type") + " " + attributeValueXHTML.isSimplified();
+		AttributeValueXHTML attributeValueXHTML = (AttributeValueXHTML) object;
+		return getString("_UI_AttributeValueXHTML_type") + " " + attributeValueXHTML.isSimplified(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -185,43 +158,38 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AttributeValueXHTML.class)) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__SIMPLIFIED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE:
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__SIMPLIFIED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE:
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE,
-				 ReqIF10Factory.eINSTANCE.createXhtmlContent()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE,
+				ReqIF10Factory.eINSTANCE.createXhtmlContent()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.ATTRIBUTE_VALUE_XHTML__THE_VALUE,
-				 ReqIF10Factory.eINSTANCE.createXhtmlContent()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.ATTRIBUTE_VALUE_XHTML__THE_VALUE,
+				ReqIF10Factory.eINSTANCE.createXhtmlContent()));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -229,14 +197,12 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		boolean qualify =
-			childFeature == ReqIF10Package.Literals.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE ||
-			childFeature == ReqIF10Package.Literals.ATTRIBUTE_VALUE_XHTML__THE_VALUE;
+		boolean qualify = childFeature == ReqIF10Package.Literals.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE
+				|| childFeature == ReqIF10Package.Literals.ATTRIBUTE_VALUE_XHTML__THE_VALUE;
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionBooleanItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionBooleanItemProvider.java
index 1dff4a3..5feb885 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionBooleanItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionBooleanItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -28,23 +27,16 @@
 import org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class DatatypeDefinitionBooleanItemProvider
-	extends DatatypeDefinitionSimpleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class DatatypeDefinitionBooleanItemProvider extends DatatypeDefinitionSimpleItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionBooleanItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +44,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,35 +58,32 @@
 	}
 
 	/**
-	 * This returns DatatypeDefinitionBoolean.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns DatatypeDefinitionBoolean.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DatatypeDefinitionBoolean"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/DatatypeDefinitionBoolean")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((DatatypeDefinitionBoolean)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_DatatypeDefinitionBoolean_type") :
-			getString("_UI_DatatypeDefinitionBoolean_type") + " " + label;
+		String label = ((DatatypeDefinitionBoolean) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_DatatypeDefinitionBoolean_type") : //$NON-NLS-1$
+				getString("_UI_DatatypeDefinitionBoolean_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -105,10 +93,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionDateItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionDateItemProvider.java
index 8d80dae..7e8b3d0 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionDateItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionDateItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -28,23 +27,16 @@
 import org.eclipse.rmf.reqif10.DatatypeDefinitionDate;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionDate} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionDate} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class DatatypeDefinitionDateItemProvider
-	extends DatatypeDefinitionSimpleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class DatatypeDefinitionDateItemProvider extends DatatypeDefinitionSimpleItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionDateItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +44,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,35 +58,32 @@
 	}
 
 	/**
-	 * This returns DatatypeDefinitionDate.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns DatatypeDefinitionDate.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DatatypeDefinitionDate"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/DatatypeDefinitionDate")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((DatatypeDefinitionDate)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_DatatypeDefinitionDate_type") :
-			getString("_UI_DatatypeDefinitionDate_type") + " " + label;
+		String label = ((DatatypeDefinitionDate) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_DatatypeDefinitionDate_type") : //$NON-NLS-1$
+				getString("_UI_DatatypeDefinitionDate_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -105,10 +93,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionEnumerationItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionEnumerationItemProvider.java
index 2b0149a..e156c4a 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionEnumerationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionEnumerationItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -33,23 +32,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class DatatypeDefinitionEnumerationItemProvider
-	extends DatatypeDefinitionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class DatatypeDefinitionEnumerationItemProvider extends DatatypeDefinitionItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionEnumerationItemProvider(AdapterFactory adapterFactory) {
@@ -57,9 +49,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,9 +65,9 @@
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,8 +80,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -102,35 +93,32 @@
 	}
 
 	/**
-	 * This returns DatatypeDefinitionEnumeration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns DatatypeDefinitionEnumeration.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DatatypeDefinitionEnumeration"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/DatatypeDefinitionEnumeration")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((DatatypeDefinitionEnumeration)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_DatatypeDefinitionEnumeration_type") :
-			getString("_UI_DatatypeDefinitionEnumeration_type") + " " + label;
+		String label = ((DatatypeDefinitionEnumeration) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_DatatypeDefinitionEnumeration_type") : //$NON-NLS-1$
+				getString("_UI_DatatypeDefinitionEnumeration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -138,28 +126,25 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(DatatypeDefinitionEnumeration.class)) {
-			case ReqIF10Package.DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES,
-				 ReqIF10Factory.eINSTANCE.createEnumValue()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES,
+				ReqIF10Factory.eINSTANCE.createEnumValue()));
 	}
 
 }
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionIntegerItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionIntegerItemProvider.java
index 7143bdf..55882d3 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionIntegerItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionIntegerItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -32,23 +31,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class DatatypeDefinitionIntegerItemProvider
-	extends DatatypeDefinitionSimpleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class DatatypeDefinitionIntegerItemProvider extends DatatypeDefinitionSimpleItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionIntegerItemProvider(AdapterFactory adapterFactory) {
@@ -56,9 +48,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,79 +64,66 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Max feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Max feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMaxPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DatatypeDefinitionInteger_max_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DatatypeDefinitionInteger_max_feature", "_UI_DatatypeDefinitionInteger_type"),
-				 ReqIF10Package.Literals.DATATYPE_DEFINITION_INTEGER__MAX,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(
+						((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_DatatypeDefinitionInteger_max_feature"), //$NON-NLS-1$
+						getString(
+								"_UI_PropertyDescriptor_description", "_UI_DatatypeDefinitionInteger_max_feature", "_UI_DatatypeDefinitionInteger_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+						ReqIF10Package.Literals.DATATYPE_DEFINITION_INTEGER__MAX, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+						null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Min feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Min feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMinPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DatatypeDefinitionInteger_min_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DatatypeDefinitionInteger_min_feature", "_UI_DatatypeDefinitionInteger_type"),
-				 ReqIF10Package.Literals.DATATYPE_DEFINITION_INTEGER__MIN,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(
+						((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_DatatypeDefinitionInteger_min_feature"), //$NON-NLS-1$
+						getString(
+								"_UI_PropertyDescriptor_description", "_UI_DatatypeDefinitionInteger_min_feature", "_UI_DatatypeDefinitionInteger_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+						ReqIF10Package.Literals.DATATYPE_DEFINITION_INTEGER__MIN, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+						null, null));
 	}
 
 	/**
-	 * This returns DatatypeDefinitionInteger.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns DatatypeDefinitionInteger.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DatatypeDefinitionInteger"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/DatatypeDefinitionInteger")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((DatatypeDefinitionInteger)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_DatatypeDefinitionInteger_type") :
-			getString("_UI_DatatypeDefinitionInteger_type") + " " + label;
+		String label = ((DatatypeDefinitionInteger) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_DatatypeDefinitionInteger_type") : //$NON-NLS-1$
+				getString("_UI_DatatypeDefinitionInteger_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -153,19 +131,18 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(DatatypeDefinitionInteger.class)) {
-			case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MAX:
-			case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MIN:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MAX:
+		case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MIN:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionItemProvider.java
index b96989b..e1064cc 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -28,23 +27,16 @@
 import org.eclipse.rmf.reqif10.DatatypeDefinition;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinition} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinition} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class DatatypeDefinitionItemProvider
-	extends IdentifiableItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class DatatypeDefinitionItemProvider extends IdentifiableItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +44,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,24 +58,22 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((DatatypeDefinition)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_DatatypeDefinition_type") :
-			getString("_UI_DatatypeDefinition_type") + " " + label;
+		String label = ((DatatypeDefinition) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_DatatypeDefinition_type") : //$NON-NLS-1$
+				getString("_UI_DatatypeDefinition_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -94,10 +83,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionRealItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionRealItemProvider.java
index 7c45e99..7f79d44 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionRealItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionRealItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -32,23 +31,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class DatatypeDefinitionRealItemProvider
-	extends DatatypeDefinitionSimpleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class DatatypeDefinitionRealItemProvider extends DatatypeDefinitionSimpleItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionRealItemProvider(AdapterFactory adapterFactory) {
@@ -56,9 +48,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,101 +65,70 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Accuracy feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Accuracy feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAccuracyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DatatypeDefinitionReal_accuracy_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DatatypeDefinitionReal_accuracy_feature", "_UI_DatatypeDefinitionReal_type"),
-				 ReqIF10Package.Literals.DATATYPE_DEFINITION_REAL__ACCURACY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(),
+				getString("_UI_DatatypeDefinitionReal_accuracy_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_DatatypeDefinitionReal_accuracy_feature", "_UI_DatatypeDefinitionReal_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.DATATYPE_DEFINITION_REAL__ACCURACY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
+				null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Max feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Max feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMaxPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DatatypeDefinitionReal_max_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DatatypeDefinitionReal_max_feature", "_UI_DatatypeDefinitionReal_type"),
-				 ReqIF10Package.Literals.DATATYPE_DEFINITION_REAL__MAX,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_DatatypeDefinitionReal_max_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_DatatypeDefinitionReal_max_feature", "_UI_DatatypeDefinitionReal_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.DATATYPE_DEFINITION_REAL__MAX, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Min feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Min feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMinPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DatatypeDefinitionReal_min_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DatatypeDefinitionReal_min_feature", "_UI_DatatypeDefinitionReal_type"),
-				 ReqIF10Package.Literals.DATATYPE_DEFINITION_REAL__MIN,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_DatatypeDefinitionReal_min_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_DatatypeDefinitionReal_min_feature", "_UI_DatatypeDefinitionReal_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.DATATYPE_DEFINITION_REAL__MIN, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This returns DatatypeDefinitionReal.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns DatatypeDefinitionReal.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DatatypeDefinitionReal"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/DatatypeDefinitionReal")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((DatatypeDefinitionReal)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_DatatypeDefinitionReal_type") :
-			getString("_UI_DatatypeDefinitionReal_type") + " " + label;
+		String label = ((DatatypeDefinitionReal) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_DatatypeDefinitionReal_type") : //$NON-NLS-1$
+				getString("_UI_DatatypeDefinitionReal_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -176,20 +136,19 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(DatatypeDefinitionReal.class)) {
-			case ReqIF10Package.DATATYPE_DEFINITION_REAL__ACCURACY:
-			case ReqIF10Package.DATATYPE_DEFINITION_REAL__MAX:
-			case ReqIF10Package.DATATYPE_DEFINITION_REAL__MIN:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		case ReqIF10Package.DATATYPE_DEFINITION_REAL__ACCURACY:
+		case ReqIF10Package.DATATYPE_DEFINITION_REAL__MAX:
+		case ReqIF10Package.DATATYPE_DEFINITION_REAL__MIN:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionSimpleItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionSimpleItemProvider.java
index 1b0355c..c94a58a 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionSimpleItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionSimpleItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -28,23 +27,16 @@
 import org.eclipse.rmf.reqif10.DatatypeDefinitionSimple;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionSimple} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionSimple} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class DatatypeDefinitionSimpleItemProvider
-	extends DatatypeDefinitionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class DatatypeDefinitionSimpleItemProvider extends DatatypeDefinitionItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionSimpleItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +44,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,24 +58,22 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((DatatypeDefinitionSimple)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_DatatypeDefinitionSimple_type") :
-			getString("_UI_DatatypeDefinitionSimple_type") + " " + label;
+		String label = ((DatatypeDefinitionSimple) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_DatatypeDefinitionSimple_type") : //$NON-NLS-1$
+				getString("_UI_DatatypeDefinitionSimple_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -94,10 +83,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionStringItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionStringItemProvider.java
index 5df96f6..304ec02 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionStringItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionStringItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -32,23 +31,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionString} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionString} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class DatatypeDefinitionStringItemProvider
-	extends DatatypeDefinitionSimpleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class DatatypeDefinitionStringItemProvider extends DatatypeDefinitionSimpleItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionStringItemProvider(AdapterFactory adapterFactory) {
@@ -56,9 +48,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -72,57 +63,49 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Max Length feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Max Length feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMaxLengthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DatatypeDefinitionString_maxLength_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DatatypeDefinitionString_maxLength_feature", "_UI_DatatypeDefinitionString_type"),
-				 ReqIF10Package.Literals.DATATYPE_DEFINITION_STRING__MAX_LENGTH,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(
+						((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_DatatypeDefinitionString_maxLength_feature"), //$NON-NLS-1$
+						getString(
+								"_UI_PropertyDescriptor_description", "_UI_DatatypeDefinitionString_maxLength_feature", "_UI_DatatypeDefinitionString_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+						ReqIF10Package.Literals.DATATYPE_DEFINITION_STRING__MAX_LENGTH, true, false, false,
+						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This returns DatatypeDefinitionString.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns DatatypeDefinitionString.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DatatypeDefinitionString"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/DatatypeDefinitionString")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((DatatypeDefinitionString)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_DatatypeDefinitionString_type") :
-			getString("_UI_DatatypeDefinitionString_type") + " " + label;
+		String label = ((DatatypeDefinitionString) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_DatatypeDefinitionString_type") : //$NON-NLS-1$
+				getString("_UI_DatatypeDefinitionString_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -130,18 +113,17 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(DatatypeDefinitionString.class)) {
-			case ReqIF10Package.DATATYPE_DEFINITION_STRING__MAX_LENGTH:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		case ReqIF10Package.DATATYPE_DEFINITION_STRING__MAX_LENGTH:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionXHTMLItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionXHTMLItemProvider.java
index 116a879..c041f96 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionXHTMLItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionXHTMLItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -28,23 +27,16 @@
 import org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class DatatypeDefinitionXHTMLItemProvider
-	extends DatatypeDefinitionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class DatatypeDefinitionXHTMLItemProvider extends DatatypeDefinitionItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionXHTMLItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +44,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,35 +58,32 @@
 	}
 
 	/**
-	 * This returns DatatypeDefinitionXHTML.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns DatatypeDefinitionXHTML.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DatatypeDefinitionXHTML"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/DatatypeDefinitionXHTML")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((DatatypeDefinitionXHTML)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_DatatypeDefinitionXHTML_type") :
-			getString("_UI_DatatypeDefinitionXHTML_type") + " " + label;
+		String label = ((DatatypeDefinitionXHTML) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_DatatypeDefinitionXHTML_type") : //$NON-NLS-1$
+				getString("_UI_DatatypeDefinitionXHTML_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -105,10 +93,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/EmbeddedValueItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/EmbeddedValueItemProvider.java
index 1ec692c..eabfced 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/EmbeddedValueItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/EmbeddedValueItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.math.BigInteger;
 
 import java.util.Collection;
@@ -37,23 +36,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.EmbeddedValue} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.EmbeddedValue} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class EmbeddedValueItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class EmbeddedValueItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EmbeddedValueItemProvider(AdapterFactory adapterFactory) {
@@ -61,9 +53,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -78,80 +69,57 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Key feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Key feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addKeyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_EmbeddedValue_key_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_EmbeddedValue_key_feature", "_UI_EmbeddedValue_type"),
-				 ReqIF10Package.Literals.EMBEDDED_VALUE__KEY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_EmbeddedValue_key_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_EmbeddedValue_key_feature", "_UI_EmbeddedValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.EMBEDDED_VALUE__KEY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Other Content feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Other Content feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addOtherContentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_EmbeddedValue_otherContent_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_EmbeddedValue_otherContent_feature", "_UI_EmbeddedValue_type"),
-				 ReqIF10Package.Literals.EMBEDDED_VALUE__OTHER_CONTENT,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_EmbeddedValue_otherContent_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_EmbeddedValue_otherContent_feature", "_UI_EmbeddedValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.EMBEDDED_VALUE__OTHER_CONTENT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This returns EmbeddedValue.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns EmbeddedValue.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EmbeddedValue"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EmbeddedValue")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		BigInteger labelValue = ((EmbeddedValue)object).getKey();
+		BigInteger labelValue = ((EmbeddedValue) object).getKey();
 		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_EmbeddedValue_type") :
-			getString("_UI_EmbeddedValue_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_EmbeddedValue_type") : //$NON-NLS-1$
+				getString("_UI_EmbeddedValue_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -159,19 +127,18 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(EmbeddedValue.class)) {
-			case ReqIF10Package.EMBEDDED_VALUE__KEY:
-			case ReqIF10Package.EMBEDDED_VALUE__OTHER_CONTENT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		case ReqIF10Package.EMBEDDED_VALUE__KEY:
+		case ReqIF10Package.EMBEDDED_VALUE__OTHER_CONTENT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -180,9 +147,8 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/EnumValueItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/EnumValueItemProvider.java
index 940c237..8497702 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/EnumValueItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/EnumValueItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -33,23 +32,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.EnumValue} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.EnumValue} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class EnumValueItemProvider
-	extends IdentifiableItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class EnumValueItemProvider extends IdentifiableItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EnumValueItemProvider(AdapterFactory adapterFactory) {
@@ -57,9 +49,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,9 +65,9 @@
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,8 +80,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -102,35 +93,32 @@
 	}
 
 	/**
-	 * This returns EnumValue.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns EnumValue.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EnumValue"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EnumValue")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((EnumValue)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_EnumValue_type") :
-			getString("_UI_EnumValue_type") + " " + label;
+		String label = ((EnumValue) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_EnumValue_type") : //$NON-NLS-1$
+				getString("_UI_EnumValue_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -138,28 +126,24 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(EnumValue.class)) {
-			case ReqIF10Package.ENUM_VALUE__PROPERTIES:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.ENUM_VALUE__PROPERTIES:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.ENUM_VALUE__PROPERTIES,
-				 ReqIF10Factory.eINSTANCE.createEmbeddedValue()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.ENUM_VALUE__PROPERTIES, ReqIF10Factory.eINSTANCE.createEmbeddedValue()));
 	}
 
 }
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/IdentifiableItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/IdentifiableItemProvider.java
index 051de9a..fb2fbb3 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/IdentifiableItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/IdentifiableItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -38,23 +37,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.Identifiable} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.Identifiable} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class IdentifiableItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class IdentifiableItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public IdentifiableItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +54,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -81,99 +72,59 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Desc feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Desc feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDescPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Identifiable_desc_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Identifiable_desc_feature", "_UI_Identifiable_type"),
-				 ReqIF10Package.Literals.IDENTIFIABLE__DESC,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_Identifiable_desc_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_Identifiable_desc_feature", "_UI_Identifiable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.IDENTIFIABLE__DESC, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Identifier feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Identifier feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdentifierPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Identifiable_identifier_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Identifiable_identifier_feature", "_UI_Identifiable_type"),
-				 ReqIF10Package.Literals.IDENTIFIABLE__IDENTIFIER,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_Identifiable_identifier_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_Identifiable_identifier_feature", "_UI_Identifiable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.IDENTIFIABLE__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Last Change feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Last Change feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLastChangePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Identifiable_lastChange_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Identifiable_lastChange_feature", "_UI_Identifiable_type"),
-				 ReqIF10Package.Literals.IDENTIFIABLE__LAST_CHANGE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_Identifiable_lastChange_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_Identifiable_lastChange_feature", "_UI_Identifiable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.IDENTIFIABLE__LAST_CHANGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Long Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Long Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLongNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Identifiable_longName_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Identifiable_longName_feature", "_UI_Identifiable_type"),
-				 ReqIF10Package.Literals.IDENTIFIABLE__LONG_NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_Identifiable_longName_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_Identifiable_longName_feature", "_UI_Identifiable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.IDENTIFIABLE__LONG_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -186,8 +137,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -199,24 +150,22 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Identifiable)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Identifiable_type") :
-			getString("_UI_Identifiable_type") + " " + label;
+		String label = ((Identifiable) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_Identifiable_type") : //$NON-NLS-1$
+				getString("_UI_Identifiable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -224,40 +173,36 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Identifiable.class)) {
-			case ReqIF10Package.IDENTIFIABLE__DESC:
-			case ReqIF10Package.IDENTIFIABLE__IDENTIFIER:
-			case ReqIF10Package.IDENTIFIABLE__LAST_CHANGE:
-			case ReqIF10Package.IDENTIFIABLE__LONG_NAME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.IDENTIFIABLE__DESC:
+		case ReqIF10Package.IDENTIFIABLE__IDENTIFIER:
+		case ReqIF10Package.IDENTIFIABLE__LAST_CHANGE:
+		case ReqIF10Package.IDENTIFIABLE__LONG_NAME:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.IDENTIFIABLE__ALTERNATIVE_ID,
-				 ReqIF10Factory.eINSTANCE.createAlternativeID()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.IDENTIFIABLE__ALTERNATIVE_ID,
+				ReqIF10Factory.eINSTANCE.createAlternativeID()));
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/RelationGroupItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/RelationGroupItemProvider.java
index a9e35ea..1db67d3 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/RelationGroupItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/RelationGroupItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -30,23 +29,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.RelationGroup} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.RelationGroup} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class RelationGroupItemProvider
-	extends IdentifiableItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class RelationGroupItemProvider extends IdentifiableItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RelationGroupItemProvider(AdapterFactory adapterFactory) {
@@ -54,9 +46,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,123 +64,82 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Spec Relations feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Spec Relations feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpecRelationsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RelationGroup_specRelations_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RelationGroup_specRelations_feature", "_UI_RelationGroup_type"),
-				 ReqIF10Package.Literals.RELATION_GROUP__SPEC_RELATIONS,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_RelationGroup_specRelations_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_RelationGroup_specRelations_feature", "_UI_RelationGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.RELATION_GROUP__SPEC_RELATIONS, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RelationGroup_type_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RelationGroup_type_feature", "_UI_RelationGroup_type"),
-				 ReqIF10Package.Literals.RELATION_GROUP__TYPE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_RelationGroup_type_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_RelationGroup_type_feature", "_UI_RelationGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.RELATION_GROUP__TYPE, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Source Specification feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Source Specification feature. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	protected void addSourceSpecificationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RelationGroup_sourceSpecification_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RelationGroup_sourceSpecification_feature", "_UI_RelationGroup_type"),
-				 ReqIF10Package.Literals.RELATION_GROUP__SOURCE_SPECIFICATION,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_RelationGroup_sourceSpecification_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_RelationGroup_sourceSpecification_feature", "_UI_RelationGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.RELATION_GROUP__SOURCE_SPECIFICATION, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Target Specification feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Target Specification feature. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	protected void addTargetSpecificationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RelationGroup_targetSpecification_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RelationGroup_targetSpecification_feature", "_UI_RelationGroup_type"),
-				 ReqIF10Package.Literals.RELATION_GROUP__TARGET_SPECIFICATION,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_RelationGroup_targetSpecification_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_RelationGroup_targetSpecification_feature", "_UI_RelationGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.RELATION_GROUP__TARGET_SPECIFICATION, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This returns RelationGroup.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns RelationGroup.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/RelationGroup"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/RelationGroup")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((RelationGroup)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_RelationGroup_type") :
-			getString("_UI_RelationGroup_type") + " " + label;
+		String label = ((RelationGroup) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_RelationGroup_type") : //$NON-NLS-1$
+				getString("_UI_RelationGroup_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -199,10 +149,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/RelationGroupTypeItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/RelationGroupTypeItemProvider.java
index 8c8c667..410962b 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/RelationGroupTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/RelationGroupTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -28,23 +27,16 @@
 import org.eclipse.rmf.reqif10.RelationGroupType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.RelationGroupType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.RelationGroupType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class RelationGroupTypeItemProvider
-	extends SpecTypeItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class RelationGroupTypeItemProvider extends SpecTypeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RelationGroupTypeItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +44,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,35 +58,32 @@
 	}
 
 	/**
-	 * This returns RelationGroupType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns RelationGroupType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/RelationGroupType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/RelationGroupType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((RelationGroupType)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_RelationGroupType_type") :
-			getString("_UI_RelationGroupType_type") + " " + label;
+		String label = ((RelationGroupType) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_RelationGroupType_type") : //$NON-NLS-1$
+				getString("_UI_RelationGroupType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -105,10 +93,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIF10ItemProviderAdapterFactory.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIF10ItemProviderAdapterFactory.java
index dbccd75..599437f 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIF10ItemProviderAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIF10ItemProviderAdapterFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -33,43 +33,41 @@
 import org.eclipse.rmf.reqif10.util.ReqIF10AdapterFactory;
 
 /**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the factory that is used to provide the interfaces needed to support Viewers. The adapters generated by this
+ * factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
+ * also support Eclipse property sheets. Note that most of the adapters are shared among multiple instances. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ReqIF10ItemProviderAdapterFactory extends ReqIF10AdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
 
 	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IChangeNotifier changeNotifier = new ChangeNotifier();
 
 	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected Collection<Object> supportedTypes = new ArrayList<Object>();
 
 	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ReqIF10ItemProviderAdapterFactory() {
@@ -82,16 +80,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeValueXHTML} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeValueXHTMLItemProvider attributeValueXHTMLItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueXHTML}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueXHTML}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -104,17 +102,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeDefinitionXHTMLItemProvider attributeDefinitionXHTMLItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,17 +125,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.ReqIFContent} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.ReqIFContent} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ReqIFContentItemProvider reqIFContentItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.ReqIFContent}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.ReqIFContent}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -150,17 +148,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.ReqIF} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.ReqIF} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ReqIFItemProvider reqIFItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.ReqIF}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.ReqIF}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -173,17 +171,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.ReqIFHeader} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.ReqIFHeader} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ReqIFHeaderItemProvider reqIFHeaderItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.ReqIFHeader}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.ReqIFHeader}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -197,16 +195,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.ReqIFToolExtension} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ReqIFToolExtensionItemProvider reqIFToolExtensionItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.ReqIFToolExtension}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.ReqIFToolExtension}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -219,17 +217,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.SpecObject} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.SpecObject} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SpecObjectItemProvider specObjectItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.SpecObject}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.SpecObject}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -242,17 +240,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.SpecObjectType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.SpecObjectType} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SpecObjectTypeItemProvider specObjectTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.SpecObjectType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.SpecObjectType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -265,17 +263,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.Specification} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.Specification} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SpecificationItemProvider specificationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.Specification}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.Specification}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -289,16 +287,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.SpecificationType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SpecificationTypeItemProvider specificationTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.SpecificationType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.SpecificationType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -311,17 +309,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.SpecHierarchy} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.SpecHierarchy} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SpecHierarchyItemProvider specHierarchyItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.SpecHierarchy}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.SpecHierarchy}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -334,17 +332,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.SpecRelation} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.SpecRelation} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SpecRelationItemProvider specRelationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.SpecRelation}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.SpecRelation}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -357,17 +355,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.SpecRelationType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.SpecRelationType} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SpecRelationTypeItemProvider specRelationTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.SpecRelationType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.SpecRelationType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -380,17 +378,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.RelationGroup} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.RelationGroup} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RelationGroupItemProvider relationGroupItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.RelationGroup}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.RelationGroup}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -404,16 +402,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.RelationGroupType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RelationGroupTypeItemProvider relationGroupTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.RelationGroupType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.RelationGroupType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -426,17 +424,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypeDefinitionXHTMLItemProvider datatypeDefinitionXHTMLItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -449,17 +447,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AlternativeID} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AlternativeID} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AlternativeIDItemProvider alternativeIDItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AlternativeID}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AlternativeID}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -472,17 +470,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeDefinitionBooleanItemProvider attributeDefinitionBooleanItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -495,17 +493,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypeDefinitionBooleanItemProvider datatypeDefinitionBooleanItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -519,16 +517,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeValueBoolean} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeValueBooleanItemProvider attributeValueBooleanItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueBoolean}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueBoolean}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -541,17 +539,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeDefinitionDate} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeDefinitionDate}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeDefinitionDateItemProvider attributeDefinitionDateItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionDate}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionDate}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -564,17 +562,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.DatatypeDefinitionDate} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.DatatypeDefinitionDate}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypeDefinitionDateItemProvider datatypeDefinitionDateItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionDate}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionDate}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -588,16 +586,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeValueDate} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeValueDateItemProvider attributeValueDateItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueDate}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueDate}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -610,17 +608,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeDefinitionEnumerationItemProvider attributeDefinitionEnumerationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -633,17 +631,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypeDefinitionEnumerationItemProvider datatypeDefinitionEnumerationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -656,17 +654,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.EnumValue} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.EnumValue} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EnumValueItemProvider enumValueItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.EnumValue}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.EnumValue}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -679,17 +677,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.EmbeddedValue} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.EmbeddedValue} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EmbeddedValueItemProvider embeddedValueItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.EmbeddedValue}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.EmbeddedValue}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -702,17 +700,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeValueEnumeration} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeValueEnumeration}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeValueEnumerationItemProvider attributeValueEnumerationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueEnumeration}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueEnumeration}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -725,17 +723,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeDefinitionIntegerItemProvider attributeDefinitionIntegerItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -748,17 +746,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypeDefinitionIntegerItemProvider datatypeDefinitionIntegerItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -772,16 +770,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeValueInteger} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeValueIntegerItemProvider attributeValueIntegerItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueInteger}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueInteger}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -794,17 +792,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeDefinitionReal} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeDefinitionReal}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeDefinitionRealItemProvider attributeDefinitionRealItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionReal}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionReal}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -817,17 +815,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypeDefinitionRealItemProvider datatypeDefinitionRealItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -841,16 +839,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeValueReal} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeValueRealItemProvider attributeValueRealItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueReal}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueReal}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -863,17 +861,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeDefinitionString} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeDefinitionString}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeDefinitionStringItemProvider attributeDefinitionStringItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionString}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeDefinitionString}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -886,17 +884,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.DatatypeDefinitionString} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.DatatypeDefinitionString}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypeDefinitionStringItemProvider datatypeDefinitionStringItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionString}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.DatatypeDefinitionString}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -910,16 +908,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.AttributeValueString} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeValueStringItemProvider attributeValueStringItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueString}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.AttributeValueString}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -932,17 +930,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.XhtmlContent} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.XhtmlContent} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlContentItemProvider xhtmlContentItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.XhtmlContent}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.XhtmlContent}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -955,9 +953,8 @@
 	}
 
 	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the root adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ComposeableAdapterFactory getRootAdapterFactory() {
@@ -965,9 +962,8 @@
 	}
 
 	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
@@ -975,8 +971,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -985,9 +981,9 @@
 	}
 
 	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This implementation substitutes the factory itself as the key for the adapter. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -996,15 +992,15 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object adapt(Object object, Object type) {
 		if (isFactoryForType(type)) {
 			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -1013,9 +1009,8 @@
 	}
 
 	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -1023,9 +1018,8 @@
 	}
 
 	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -1033,9 +1027,9 @@
 	}
 
 	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void fireNotifyChanged(Notification notification) {
@@ -1047,50 +1041,87 @@
 	}
 
 	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This disposes all of the item providers created by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void dispose() {
-		if (attributeValueXHTMLItemProvider != null) attributeValueXHTMLItemProvider.dispose();
-		if (attributeDefinitionXHTMLItemProvider != null) attributeDefinitionXHTMLItemProvider.dispose();
-		if (reqIFContentItemProvider != null) reqIFContentItemProvider.dispose();
-		if (reqIFItemProvider != null) reqIFItemProvider.dispose();
-		if (reqIFHeaderItemProvider != null) reqIFHeaderItemProvider.dispose();
-		if (reqIFToolExtensionItemProvider != null) reqIFToolExtensionItemProvider.dispose();
-		if (specObjectItemProvider != null) specObjectItemProvider.dispose();
-		if (specObjectTypeItemProvider != null) specObjectTypeItemProvider.dispose();
-		if (specificationItemProvider != null) specificationItemProvider.dispose();
-		if (specificationTypeItemProvider != null) specificationTypeItemProvider.dispose();
-		if (specHierarchyItemProvider != null) specHierarchyItemProvider.dispose();
-		if (specRelationItemProvider != null) specRelationItemProvider.dispose();
-		if (specRelationTypeItemProvider != null) specRelationTypeItemProvider.dispose();
-		if (relationGroupItemProvider != null) relationGroupItemProvider.dispose();
-		if (relationGroupTypeItemProvider != null) relationGroupTypeItemProvider.dispose();
-		if (datatypeDefinitionXHTMLItemProvider != null) datatypeDefinitionXHTMLItemProvider.dispose();
-		if (alternativeIDItemProvider != null) alternativeIDItemProvider.dispose();
-		if (attributeDefinitionBooleanItemProvider != null) attributeDefinitionBooleanItemProvider.dispose();
-		if (datatypeDefinitionBooleanItemProvider != null) datatypeDefinitionBooleanItemProvider.dispose();
-		if (attributeValueBooleanItemProvider != null) attributeValueBooleanItemProvider.dispose();
-		if (attributeDefinitionDateItemProvider != null) attributeDefinitionDateItemProvider.dispose();
-		if (datatypeDefinitionDateItemProvider != null) datatypeDefinitionDateItemProvider.dispose();
-		if (attributeValueDateItemProvider != null) attributeValueDateItemProvider.dispose();
-		if (attributeDefinitionEnumerationItemProvider != null) attributeDefinitionEnumerationItemProvider.dispose();
-		if (datatypeDefinitionEnumerationItemProvider != null) datatypeDefinitionEnumerationItemProvider.dispose();
-		if (enumValueItemProvider != null) enumValueItemProvider.dispose();
-		if (embeddedValueItemProvider != null) embeddedValueItemProvider.dispose();
-		if (attributeValueEnumerationItemProvider != null) attributeValueEnumerationItemProvider.dispose();
-		if (attributeDefinitionIntegerItemProvider != null) attributeDefinitionIntegerItemProvider.dispose();
-		if (datatypeDefinitionIntegerItemProvider != null) datatypeDefinitionIntegerItemProvider.dispose();
-		if (attributeValueIntegerItemProvider != null) attributeValueIntegerItemProvider.dispose();
-		if (attributeDefinitionRealItemProvider != null) attributeDefinitionRealItemProvider.dispose();
-		if (datatypeDefinitionRealItemProvider != null) datatypeDefinitionRealItemProvider.dispose();
-		if (attributeValueRealItemProvider != null) attributeValueRealItemProvider.dispose();
-		if (attributeDefinitionStringItemProvider != null) attributeDefinitionStringItemProvider.dispose();
-		if (datatypeDefinitionStringItemProvider != null) datatypeDefinitionStringItemProvider.dispose();
-		if (attributeValueStringItemProvider != null) attributeValueStringItemProvider.dispose();
-		if (xhtmlContentItemProvider != null) xhtmlContentItemProvider.dispose();
+		if (attributeValueXHTMLItemProvider != null)
+			attributeValueXHTMLItemProvider.dispose();
+		if (attributeDefinitionXHTMLItemProvider != null)
+			attributeDefinitionXHTMLItemProvider.dispose();
+		if (reqIFContentItemProvider != null)
+			reqIFContentItemProvider.dispose();
+		if (reqIFItemProvider != null)
+			reqIFItemProvider.dispose();
+		if (reqIFHeaderItemProvider != null)
+			reqIFHeaderItemProvider.dispose();
+		if (reqIFToolExtensionItemProvider != null)
+			reqIFToolExtensionItemProvider.dispose();
+		if (specObjectItemProvider != null)
+			specObjectItemProvider.dispose();
+		if (specObjectTypeItemProvider != null)
+			specObjectTypeItemProvider.dispose();
+		if (specificationItemProvider != null)
+			specificationItemProvider.dispose();
+		if (specificationTypeItemProvider != null)
+			specificationTypeItemProvider.dispose();
+		if (specHierarchyItemProvider != null)
+			specHierarchyItemProvider.dispose();
+		if (specRelationItemProvider != null)
+			specRelationItemProvider.dispose();
+		if (specRelationTypeItemProvider != null)
+			specRelationTypeItemProvider.dispose();
+		if (relationGroupItemProvider != null)
+			relationGroupItemProvider.dispose();
+		if (relationGroupTypeItemProvider != null)
+			relationGroupTypeItemProvider.dispose();
+		if (datatypeDefinitionXHTMLItemProvider != null)
+			datatypeDefinitionXHTMLItemProvider.dispose();
+		if (alternativeIDItemProvider != null)
+			alternativeIDItemProvider.dispose();
+		if (attributeDefinitionBooleanItemProvider != null)
+			attributeDefinitionBooleanItemProvider.dispose();
+		if (datatypeDefinitionBooleanItemProvider != null)
+			datatypeDefinitionBooleanItemProvider.dispose();
+		if (attributeValueBooleanItemProvider != null)
+			attributeValueBooleanItemProvider.dispose();
+		if (attributeDefinitionDateItemProvider != null)
+			attributeDefinitionDateItemProvider.dispose();
+		if (datatypeDefinitionDateItemProvider != null)
+			datatypeDefinitionDateItemProvider.dispose();
+		if (attributeValueDateItemProvider != null)
+			attributeValueDateItemProvider.dispose();
+		if (attributeDefinitionEnumerationItemProvider != null)
+			attributeDefinitionEnumerationItemProvider.dispose();
+		if (datatypeDefinitionEnumerationItemProvider != null)
+			datatypeDefinitionEnumerationItemProvider.dispose();
+		if (enumValueItemProvider != null)
+			enumValueItemProvider.dispose();
+		if (embeddedValueItemProvider != null)
+			embeddedValueItemProvider.dispose();
+		if (attributeValueEnumerationItemProvider != null)
+			attributeValueEnumerationItemProvider.dispose();
+		if (attributeDefinitionIntegerItemProvider != null)
+			attributeDefinitionIntegerItemProvider.dispose();
+		if (datatypeDefinitionIntegerItemProvider != null)
+			datatypeDefinitionIntegerItemProvider.dispose();
+		if (attributeValueIntegerItemProvider != null)
+			attributeValueIntegerItemProvider.dispose();
+		if (attributeDefinitionRealItemProvider != null)
+			attributeDefinitionRealItemProvider.dispose();
+		if (datatypeDefinitionRealItemProvider != null)
+			datatypeDefinitionRealItemProvider.dispose();
+		if (attributeValueRealItemProvider != null)
+			attributeValueRealItemProvider.dispose();
+		if (attributeDefinitionStringItemProvider != null)
+			attributeDefinitionStringItemProvider.dispose();
+		if (datatypeDefinitionStringItemProvider != null)
+			datatypeDefinitionStringItemProvider.dispose();
+		if (attributeValueStringItemProvider != null)
+			attributeValueStringItemProvider.dispose();
+		if (xhtmlContentItemProvider != null)
+			xhtmlContentItemProvider.dispose();
 	}
 
 }
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIFContentItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIFContentItemProvider.java
index 94376fa..ede15c5 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIFContentItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIFContentItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -36,23 +35,16 @@
 import org.eclipse.rmf.reqif10.ReqIFContent;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.ReqIFContent} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.ReqIFContent} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class ReqIFContentItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class ReqIFContentItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ReqIFContentItemProvider(AdapterFactory adapterFactory) {
@@ -60,9 +52,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -77,9 +68,9 @@
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,8 +88,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -110,32 +101,30 @@
 	}
 
 	/**
-	 * This returns ReqIFContent.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ReqIFContent.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ReqIFContent"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ReqIFContent")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_ReqIFContent_type");
+		return getString("_UI_ReqIFContent_type"); //$NON-NLS-1$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -143,109 +132,77 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ReqIFContent.class)) {
-			case ReqIF10Package.REQ_IF_CONTENT__DATATYPES:
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_TYPES:
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_OBJECTS:
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATIONS:
-			case ReqIF10Package.REQ_IF_CONTENT__SPECIFICATIONS:
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATION_GROUPS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.REQ_IF_CONTENT__DATATYPES:
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_TYPES:
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_OBJECTS:
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATIONS:
+		case ReqIF10Package.REQ_IF_CONTENT__SPECIFICATIONS:
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATION_GROUPS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_CONTENT__DATATYPES,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionXHTML()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_CONTENT__DATATYPES,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionXHTML()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_CONTENT__DATATYPES,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionBoolean()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_CONTENT__DATATYPES,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionBoolean()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_CONTENT__DATATYPES,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionDate()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_CONTENT__DATATYPES,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionDate()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_CONTENT__DATATYPES,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionEnumeration()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_CONTENT__DATATYPES,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionEnumeration()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_CONTENT__DATATYPES,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionInteger()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_CONTENT__DATATYPES,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionInteger()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_CONTENT__DATATYPES,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionReal()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_CONTENT__DATATYPES,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionReal()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_CONTENT__DATATYPES,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionString()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_CONTENT__DATATYPES,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionString()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_CONTENT__SPEC_TYPES,
-				 ReqIF10Factory.eINSTANCE.createSpecObjectType()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_CONTENT__SPEC_TYPES,
+				ReqIF10Factory.eINSTANCE.createSpecObjectType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_CONTENT__SPEC_TYPES,
-				 ReqIF10Factory.eINSTANCE.createSpecificationType()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_CONTENT__SPEC_TYPES,
+				ReqIF10Factory.eINSTANCE.createSpecificationType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_CONTENT__SPEC_TYPES,
-				 ReqIF10Factory.eINSTANCE.createSpecRelationType()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_CONTENT__SPEC_TYPES,
+				ReqIF10Factory.eINSTANCE.createSpecRelationType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_CONTENT__SPEC_TYPES,
-				 ReqIF10Factory.eINSTANCE.createRelationGroupType()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_CONTENT__SPEC_TYPES,
+				ReqIF10Factory.eINSTANCE.createRelationGroupType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_CONTENT__SPEC_OBJECTS,
-				 ReqIF10Factory.eINSTANCE.createSpecObject()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_CONTENT__SPEC_OBJECTS,
+				ReqIF10Factory.eINSTANCE.createSpecObject()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_CONTENT__SPEC_RELATIONS,
-				 ReqIF10Factory.eINSTANCE.createSpecRelation()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_CONTENT__SPEC_RELATIONS,
+				ReqIF10Factory.eINSTANCE.createSpecRelation()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_CONTENT__SPECIFICATIONS,
-				 ReqIF10Factory.eINSTANCE.createSpecification()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_CONTENT__SPECIFICATIONS,
+				ReqIF10Factory.eINSTANCE.createSpecification()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_CONTENT__SPEC_RELATION_GROUPS,
-				 ReqIF10Factory.eINSTANCE.createRelationGroup()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_CONTENT__SPEC_RELATION_GROUPS,
+				ReqIF10Factory.eINSTANCE.createRelationGroup()));
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIFHeaderItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIFHeaderItemProvider.java
index 19107bd..1be2b85 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIFHeaderItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIFHeaderItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -35,23 +34,16 @@
 import org.eclipse.rmf.reqif10.ReqIFHeader;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.ReqIFHeader} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.ReqIFHeader} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class ReqIFHeaderItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class ReqIFHeaderItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ReqIFHeaderItemProvider(AdapterFactory adapterFactory) {
@@ -59,9 +51,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -82,211 +73,128 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Comment feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Comment feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCommentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ReqIFHeader_comment_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ReqIFHeader_comment_feature", "_UI_ReqIFHeader_type"),
-				 ReqIF10Package.Literals.REQ_IF_HEADER__COMMENT,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ReqIFHeader_comment_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ReqIFHeader_comment_feature", "_UI_ReqIFHeader_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.REQ_IF_HEADER__COMMENT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Creation Time feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Creation Time feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCreationTimePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ReqIFHeader_creationTime_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ReqIFHeader_creationTime_feature", "_UI_ReqIFHeader_type"),
-				 ReqIF10Package.Literals.REQ_IF_HEADER__CREATION_TIME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ReqIFHeader_creationTime_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ReqIFHeader_creationTime_feature", "_UI_ReqIFHeader_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.REQ_IF_HEADER__CREATION_TIME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Identifier feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Identifier feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdentifierPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ReqIFHeader_identifier_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ReqIFHeader_identifier_feature", "_UI_ReqIFHeader_type"),
-				 ReqIF10Package.Literals.REQ_IF_HEADER__IDENTIFIER,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ReqIFHeader_identifier_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ReqIFHeader_identifier_feature", "_UI_ReqIFHeader_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.REQ_IF_HEADER__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Repository Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Repository Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addRepositoryIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ReqIFHeader_repositoryId_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ReqIFHeader_repositoryId_feature", "_UI_ReqIFHeader_type"),
-				 ReqIF10Package.Literals.REQ_IF_HEADER__REPOSITORY_ID,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ReqIFHeader_repositoryId_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ReqIFHeader_repositoryId_feature", "_UI_ReqIFHeader_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.REQ_IF_HEADER__REPOSITORY_ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Req IF Tool Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Req IF Tool Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addReqIFToolIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ReqIFHeader_reqIFToolId_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ReqIFHeader_reqIFToolId_feature", "_UI_ReqIFHeader_type"),
-				 ReqIF10Package.Literals.REQ_IF_HEADER__REQ_IF_TOOL_ID,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ReqIFHeader_reqIFToolId_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ReqIFHeader_reqIFToolId_feature", "_UI_ReqIFHeader_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.REQ_IF_HEADER__REQ_IF_TOOL_ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Req IF Version feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Req IF Version feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addReqIFVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ReqIFHeader_reqIFVersion_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ReqIFHeader_reqIFVersion_feature", "_UI_ReqIFHeader_type"),
-				 ReqIF10Package.Literals.REQ_IF_HEADER__REQ_IF_VERSION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ReqIFHeader_reqIFVersion_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ReqIFHeader_reqIFVersion_feature", "_UI_ReqIFHeader_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.REQ_IF_HEADER__REQ_IF_VERSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Source Tool Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Source Tool Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSourceToolIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ReqIFHeader_sourceToolId_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ReqIFHeader_sourceToolId_feature", "_UI_ReqIFHeader_type"),
-				 ReqIF10Package.Literals.REQ_IF_HEADER__SOURCE_TOOL_ID,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ReqIFHeader_sourceToolId_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ReqIFHeader_sourceToolId_feature", "_UI_ReqIFHeader_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.REQ_IF_HEADER__SOURCE_TOOL_ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ReqIFHeader_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ReqIFHeader_title_feature", "_UI_ReqIFHeader_type"),
-				 ReqIF10Package.Literals.REQ_IF_HEADER__TITLE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ReqIFHeader_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ReqIFHeader_title_feature", "_UI_ReqIFHeader_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.REQ_IF_HEADER__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This returns ReqIFHeader.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ReqIFHeader.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ReqIFHeader"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ReqIFHeader")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((ReqIFHeader)object).getComment();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ReqIFHeader_type") :
-			getString("_UI_ReqIFHeader_type") + " " + label;
+		String label = ((ReqIFHeader) object).getComment();
+		return label == null || label.length() == 0 ? getString("_UI_ReqIFHeader_type") : //$NON-NLS-1$
+				getString("_UI_ReqIFHeader_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -294,25 +202,24 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ReqIFHeader.class)) {
-			case ReqIF10Package.REQ_IF_HEADER__COMMENT:
-			case ReqIF10Package.REQ_IF_HEADER__CREATION_TIME:
-			case ReqIF10Package.REQ_IF_HEADER__IDENTIFIER:
-			case ReqIF10Package.REQ_IF_HEADER__REPOSITORY_ID:
-			case ReqIF10Package.REQ_IF_HEADER__REQ_IF_TOOL_ID:
-			case ReqIF10Package.REQ_IF_HEADER__REQ_IF_VERSION:
-			case ReqIF10Package.REQ_IF_HEADER__SOURCE_TOOL_ID:
-			case ReqIF10Package.REQ_IF_HEADER__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		case ReqIF10Package.REQ_IF_HEADER__COMMENT:
+		case ReqIF10Package.REQ_IF_HEADER__CREATION_TIME:
+		case ReqIF10Package.REQ_IF_HEADER__IDENTIFIER:
+		case ReqIF10Package.REQ_IF_HEADER__REPOSITORY_ID:
+		case ReqIF10Package.REQ_IF_HEADER__REQ_IF_TOOL_ID:
+		case ReqIF10Package.REQ_IF_HEADER__REQ_IF_VERSION:
+		case ReqIF10Package.REQ_IF_HEADER__SOURCE_TOOL_ID:
+		case ReqIF10Package.REQ_IF_HEADER__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -321,9 +228,8 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIFItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIFItemProvider.java
index e8619a6..20c9b76 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIFItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIFItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -38,23 +37,16 @@
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.ReqIF} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.ReqIF} object. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
-public class ReqIFItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class ReqIFItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ReqIFItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +54,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -78,33 +69,23 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ReqIF_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ReqIF_lang_feature", "_UI_ReqIF_type"),
-				 ReqIF10Package.Literals.REQ_IF__LANG,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ReqIF_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ReqIF_lang_feature", "_UI_ReqIF_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.REQ_IF__LANG, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -119,8 +100,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -132,35 +113,32 @@
 	}
 
 	/**
-	 * This returns ReqIF.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ReqIF.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ReqIF"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ReqIF")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((ReqIF)object).getLang();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ReqIF_type") :
-			getString("_UI_ReqIF_type") + " " + label;
+		String label = ((ReqIF) object).getLang();
+		return label == null || label.length() == 0 ? getString("_UI_ReqIF_type") : //$NON-NLS-1$
+				getString("_UI_ReqIF_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -168,49 +146,39 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ReqIF.class)) {
-			case ReqIF10Package.REQ_IF__LANG:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case ReqIF10Package.REQ_IF__THE_HEADER:
-			case ReqIF10Package.REQ_IF__CORE_CONTENT:
-			case ReqIF10Package.REQ_IF__TOOL_EXTENSIONS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.REQ_IF__LANG:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case ReqIF10Package.REQ_IF__THE_HEADER:
+		case ReqIF10Package.REQ_IF__CORE_CONTENT:
+		case ReqIF10Package.REQ_IF__TOOL_EXTENSIONS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF__THE_HEADER,
-				 ReqIF10Factory.eINSTANCE.createReqIFHeader()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF__THE_HEADER, ReqIF10Factory.eINSTANCE.createReqIFHeader()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF__CORE_CONTENT,
-				 ReqIF10Factory.eINSTANCE.createReqIFContent()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF__CORE_CONTENT, ReqIF10Factory.eINSTANCE.createReqIFContent()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF__TOOL_EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createReqIFToolExtension()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF__TOOL_EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createReqIFToolExtension()));
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIFToolExtensionItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIFToolExtensionItemProvider.java
index 64ff213..8fe1fc8 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIFToolExtensionItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/ReqIFToolExtensionItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -38,23 +37,16 @@
 import org.eclipse.rmf.reqif10.ReqIFToolExtension;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.ReqIFToolExtension} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.ReqIFToolExtension} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class ReqIFToolExtensionItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class ReqIFToolExtensionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ReqIFToolExtensionItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +54,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -79,9 +70,9 @@
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -94,8 +85,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -107,32 +98,30 @@
 	}
 
 	/**
-	 * This returns ReqIFToolExtension.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ReqIFToolExtension.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ReqIFToolExtension"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ReqIFToolExtension")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_ReqIFToolExtension_type");
+		return getString("_UI_ReqIFToolExtension_type"); //$NON-NLS-1$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -140,224 +129,144 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ReqIFToolExtension.class)) {
-			case ReqIF10Package.REQ_IF_TOOL_EXTENSION__EXTENSIONS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.REQ_IF_TOOL_EXTENSION__EXTENSIONS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueXHTML()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createAttributeValueXHTML()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionXHTML()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionXHTML()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createReqIFContent()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createReqIFContent()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createReqIF()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createReqIF()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createReqIFHeader()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createReqIFHeader()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createReqIFToolExtension()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createReqIFToolExtension()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createSpecObject()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createSpecObject()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createSpecObjectType()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createSpecObjectType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createSpecification()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createSpecification()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createSpecificationType()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createSpecificationType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createSpecHierarchy()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createSpecHierarchy()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createSpecRelation()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createSpecRelation()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createSpecRelationType()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createSpecRelationType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createRelationGroup()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createRelationGroup()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createRelationGroupType()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createRelationGroupType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionXHTML()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionXHTML()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createAlternativeID()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createAlternativeID()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionBoolean()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionBoolean()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionBoolean()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionBoolean()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueBoolean()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createAttributeValueBoolean()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionDate()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionDate()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionDate()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionDate()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueDate()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createAttributeValueDate()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionEnumeration()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionEnumeration()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionEnumeration()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionEnumeration()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createEnumValue()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createEnumValue()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createEmbeddedValue()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createEmbeddedValue()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueEnumeration()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createAttributeValueEnumeration()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionInteger()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionInteger()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionInteger()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionInteger()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueInteger()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createAttributeValueInteger()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionReal()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionReal()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionReal()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionReal()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueReal()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createAttributeValueReal()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionString()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionString()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionString()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionString()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueString()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createAttributeValueString()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 ReqIF10Factory.eINSTANCE.createXhtmlContent()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				ReqIF10Factory.eINSTANCE.createXhtmlContent()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
-				 XMLTypeFactory.eINSTANCE.createAnyType()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.REQ_IF_TOOL_EXTENSION__EXTENSIONS,
+				XMLTypeFactory.eINSTANCE.createAnyType()));
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/Reqif10EditPlugin.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/Reqif10EditPlugin.java
index 9083e18..4f7a59b 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/Reqif10EditPlugin.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/Reqif10EditPlugin.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,44 +16,37 @@
 import org.eclipse.emf.common.util.ResourceLocator;
 
 /**
- * This is the central singleton for the Reqif10 edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the central singleton for the Reqif10 edit plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public final class Reqif10EditPlugin extends EMFPlugin {
 	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final Reqif10EditPlugin INSTANCE = new Reqif10EditPlugin();
 
 	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static Implementation plugin;
 
 	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Reqif10EditPlugin() {
-		super
-		  (new ResourceLocator [] {
-		   });
+		super(new ResourceLocator[] {});
 	}
 
 	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -63,9 +56,8 @@
 	}
 
 	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -74,16 +66,14 @@
 	}
 
 	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The actual implementation of the Eclipse <b>Plugin</b>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static class Implementation extends EclipsePlugin {
 		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		public Implementation() {
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecElementWithAttributesItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecElementWithAttributesItemProvider.java
index 95dd431..db1ee10 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecElementWithAttributesItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecElementWithAttributesItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -33,23 +32,16 @@
 import org.eclipse.rmf.reqif10.SpecElementWithAttributes;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.SpecElementWithAttributes} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.SpecElementWithAttributes} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class SpecElementWithAttributesItemProvider
-	extends IdentifiableItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class SpecElementWithAttributesItemProvider extends IdentifiableItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecElementWithAttributesItemProvider(AdapterFactory adapterFactory) {
@@ -57,9 +49,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,9 +65,9 @@
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,8 +80,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -102,24 +93,22 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((SpecElementWithAttributes)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_SpecElementWithAttributes_type") :
-			getString("_UI_SpecElementWithAttributes_type") + " " + label;
+		String label = ((SpecElementWithAttributes) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_SpecElementWithAttributes_type") : //$NON-NLS-1$
+				getString("_UI_SpecElementWithAttributes_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,58 +116,43 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(SpecElementWithAttributes.class)) {
-			case ReqIF10Package.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueXHTML()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES,
+				ReqIF10Factory.eINSTANCE.createAttributeValueXHTML()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueBoolean()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES,
+				ReqIF10Factory.eINSTANCE.createAttributeValueBoolean()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueDate()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES,
+				ReqIF10Factory.eINSTANCE.createAttributeValueDate()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueEnumeration()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES,
+				ReqIF10Factory.eINSTANCE.createAttributeValueEnumeration()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueInteger()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES,
+				ReqIF10Factory.eINSTANCE.createAttributeValueInteger()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueReal()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES,
+				ReqIF10Factory.eINSTANCE.createAttributeValueReal()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueString()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES,
+				ReqIF10Factory.eINSTANCE.createAttributeValueString()));
 	}
 
 }
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecHierarchyItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecHierarchyItemProvider.java
index 4d79580..f77033b 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecHierarchyItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecHierarchyItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -35,23 +34,16 @@
 import org.eclipse.rmf.reqif10.SpecHierarchy;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.SpecHierarchy} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.SpecHierarchy} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class SpecHierarchyItemProvider
-	extends AccessControlledElementItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class SpecHierarchyItemProvider extends AccessControlledElementItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecHierarchyItemProvider(AdapterFactory adapterFactory) {
@@ -59,9 +51,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -77,77 +68,47 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Table Internal feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Table Internal feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTableInternalPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_SpecHierarchy_tableInternal_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_SpecHierarchy_tableInternal_feature", "_UI_SpecHierarchy_type"),
-				 ReqIF10Package.Literals.SPEC_HIERARCHY__TABLE_INTERNAL,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_SpecHierarchy_tableInternal_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_SpecHierarchy_tableInternal_feature", "_UI_SpecHierarchy_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.SPEC_HIERARCHY__TABLE_INTERNAL, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Object feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Object feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addObjectPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_SpecHierarchy_object_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_SpecHierarchy_object_feature", "_UI_SpecHierarchy_type"),
-				 ReqIF10Package.Literals.SPEC_HIERARCHY__OBJECT,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_SpecHierarchy_object_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_SpecHierarchy_object_feature", "_UI_SpecHierarchy_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.SPEC_HIERARCHY__OBJECT, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Editable Atts feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Editable Atts feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addEditableAttsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_SpecHierarchy_editableAtts_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_SpecHierarchy_editableAtts_feature", "_UI_SpecHierarchy_type"),
-				 ReqIF10Package.Literals.SPEC_HIERARCHY__EDITABLE_ATTS,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_SpecHierarchy_editableAtts_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_SpecHierarchy_editableAtts_feature", "_UI_SpecHierarchy_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.SPEC_HIERARCHY__EDITABLE_ATTS, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -160,8 +121,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -173,35 +134,32 @@
 	}
 
 	/**
-	 * This returns SpecHierarchy.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns SpecHierarchy.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SpecHierarchy"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/SpecHierarchy")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((SpecHierarchy)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_SpecHierarchy_type") :
-			getString("_UI_SpecHierarchy_type") + " " + label;
+		String label = ((SpecHierarchy) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_SpecHierarchy_type") : //$NON-NLS-1$
+				getString("_UI_SpecHierarchy_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -209,31 +167,28 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(SpecHierarchy.class)) {
-			case ReqIF10Package.SPEC_HIERARCHY__TABLE_INTERNAL:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case ReqIF10Package.SPEC_HIERARCHY__CHILDREN:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.SPEC_HIERARCHY__TABLE_INTERNAL:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case ReqIF10Package.SPEC_HIERARCHY__CHILDREN:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.SPEC_HIERARCHY__CHILDREN,
-				 ReqIF10Factory.eINSTANCE.createSpecHierarchy()));
+		newChildDescriptors
+				.add(createChildParameter(ReqIF10Package.Literals.SPEC_HIERARCHY__CHILDREN, ReqIF10Factory.eINSTANCE.createSpecHierarchy()));
 	}
 
 }
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecObjectItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecObjectItemProvider.java
index e972700..6a5c09c 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecObjectItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecObjectItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -30,23 +29,16 @@
 import org.eclipse.rmf.reqif10.SpecObject;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.SpecObject} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.SpecObject} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class SpecObjectItemProvider
-	extends SpecElementWithAttributesItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class SpecObjectItemProvider extends SpecElementWithAttributesItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecObjectItemProvider(AdapterFactory adapterFactory) {
@@ -54,9 +46,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -70,57 +61,44 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_SpecObject_type_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_SpecObject_type_feature", "_UI_SpecObject_type"),
-				 ReqIF10Package.Literals.SPEC_OBJECT__TYPE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_SpecObject_type_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_SpecObject_type_feature", "_UI_SpecObject_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.SPEC_OBJECT__TYPE, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This returns SpecObject.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns SpecObject.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SpecObject"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/SpecObject")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((SpecObject)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_SpecObject_type") :
-			getString("_UI_SpecObject_type") + " " + label;
+		String label = ((SpecObject) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_SpecObject_type") : //$NON-NLS-1$
+				getString("_UI_SpecObject_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -130,10 +108,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecObjectTypeItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecObjectTypeItemProvider.java
index 583564b..f1b78e6 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecObjectTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecObjectTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -28,23 +27,16 @@
 import org.eclipse.rmf.reqif10.SpecObjectType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.SpecObjectType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.SpecObjectType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class SpecObjectTypeItemProvider
-	extends SpecTypeItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class SpecObjectTypeItemProvider extends SpecTypeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecObjectTypeItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +44,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,35 +58,32 @@
 	}
 
 	/**
-	 * This returns SpecObjectType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns SpecObjectType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SpecObjectType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/SpecObjectType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((SpecObjectType)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_SpecObjectType_type") :
-			getString("_UI_SpecObjectType_type") + " " + label;
+		String label = ((SpecObjectType) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_SpecObjectType_type") : //$NON-NLS-1$
+				getString("_UI_SpecObjectType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -105,10 +93,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecRelationItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecRelationItemProvider.java
index 71948ca..ad02780 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecRelationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecRelationItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -30,23 +29,16 @@
 import org.eclipse.rmf.reqif10.SpecRelation;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.SpecRelation} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.SpecRelation} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class SpecRelationItemProvider
-	extends SpecElementWithAttributesItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class SpecRelationItemProvider extends SpecElementWithAttributesItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecRelationItemProvider(AdapterFactory adapterFactory) {
@@ -54,9 +46,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -72,101 +63,68 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Target feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Target feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTargetPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_SpecRelation_target_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_SpecRelation_target_feature", "_UI_SpecRelation_type"),
-				 ReqIF10Package.Literals.SPEC_RELATION__TARGET,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_SpecRelation_target_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_SpecRelation_target_feature", "_UI_SpecRelation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.SPEC_RELATION__TARGET, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Source feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Source feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSourcePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_SpecRelation_source_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_SpecRelation_source_feature", "_UI_SpecRelation_type"),
-				 ReqIF10Package.Literals.SPEC_RELATION__SOURCE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_SpecRelation_source_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_SpecRelation_source_feature", "_UI_SpecRelation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.SPEC_RELATION__SOURCE, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_SpecRelation_type_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_SpecRelation_type_feature", "_UI_SpecRelation_type"),
-				 ReqIF10Package.Literals.SPEC_RELATION__TYPE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_SpecRelation_type_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_SpecRelation_type_feature", "_UI_SpecRelation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.SPEC_RELATION__TYPE, true, false, true, null, null, null));
 	}
 
 	/**
-	 * This returns SpecRelation.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns SpecRelation.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SpecRelation"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/SpecRelation")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((SpecRelation)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_SpecRelation_type") :
-			getString("_UI_SpecRelation_type") + " " + label;
+		String label = ((SpecRelation) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_SpecRelation_type") : //$NON-NLS-1$
+				getString("_UI_SpecRelation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -176,10 +134,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecRelationTypeItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecRelationTypeItemProvider.java
index 2e83ff6..80b4636 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecRelationTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecRelationTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -28,23 +27,16 @@
 import org.eclipse.rmf.reqif10.SpecRelationType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.SpecRelationType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.SpecRelationType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class SpecRelationTypeItemProvider
-	extends SpecTypeItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class SpecRelationTypeItemProvider extends SpecTypeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecRelationTypeItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +44,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,35 +58,32 @@
 	}
 
 	/**
-	 * This returns SpecRelationType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns SpecRelationType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SpecRelationType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/SpecRelationType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((SpecRelationType)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_SpecRelationType_type") :
-			getString("_UI_SpecRelationType_type") + " " + label;
+		String label = ((SpecRelationType) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_SpecRelationType_type") : //$NON-NLS-1$
+				getString("_UI_SpecRelationType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -105,10 +93,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecTypeItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecTypeItemProvider.java
index c074c64..eed6f0b 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -33,23 +32,16 @@
 import org.eclipse.rmf.reqif10.SpecType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.SpecType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.SpecType} object. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
-public class SpecTypeItemProvider
-	extends IdentifiableItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class SpecTypeItemProvider extends IdentifiableItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecTypeItemProvider(AdapterFactory adapterFactory) {
@@ -57,9 +49,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,9 +65,9 @@
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,8 +80,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -102,24 +93,22 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((SpecType)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_SpecType_type") :
-			getString("_UI_SpecType_type") + " " + label;
+		String label = ((SpecType) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_SpecType_type") : //$NON-NLS-1$
+				getString("_UI_SpecType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,58 +116,43 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(SpecType.class)) {
-			case ReqIF10Package.SPEC_TYPE__SPEC_ATTRIBUTES:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.SPEC_TYPE__SPEC_ATTRIBUTES:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.SPEC_TYPE__SPEC_ATTRIBUTES,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionXHTML()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.SPEC_TYPE__SPEC_ATTRIBUTES,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionXHTML()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.SPEC_TYPE__SPEC_ATTRIBUTES,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionBoolean()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.SPEC_TYPE__SPEC_ATTRIBUTES,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionBoolean()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.SPEC_TYPE__SPEC_ATTRIBUTES,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionDate()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.SPEC_TYPE__SPEC_ATTRIBUTES,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionDate()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.SPEC_TYPE__SPEC_ATTRIBUTES,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionEnumeration()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.SPEC_TYPE__SPEC_ATTRIBUTES,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionEnumeration()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.SPEC_TYPE__SPEC_ATTRIBUTES,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionInteger()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.SPEC_TYPE__SPEC_ATTRIBUTES,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionInteger()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.SPEC_TYPE__SPEC_ATTRIBUTES,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionReal()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.SPEC_TYPE__SPEC_ATTRIBUTES,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionReal()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.SPEC_TYPE__SPEC_ATTRIBUTES,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionString()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.SPEC_TYPE__SPEC_ATTRIBUTES,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionString()));
 	}
 
 }
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecificationItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecificationItemProvider.java
index 4d4cd0c..47aad30 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecificationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecificationItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -34,23 +33,16 @@
 import org.eclipse.rmf.reqif10.Specification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.Specification} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.Specification} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class SpecificationItemProvider
-	extends SpecElementWithAttributesItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class SpecificationItemProvider extends SpecElementWithAttributesItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecificationItemProvider(AdapterFactory adapterFactory) {
@@ -58,9 +50,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,33 +65,23 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Specification_type_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Specification_type_feature", "_UI_Specification_type"),
-				 ReqIF10Package.Literals.SPECIFICATION__TYPE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_Specification_type_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_Specification_type_feature", "_UI_Specification_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.SPECIFICATION__TYPE, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,8 +94,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -126,35 +107,32 @@
 	}
 
 	/**
-	 * This returns Specification.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns Specification.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Specification"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Specification")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Specification)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Specification_type") :
-			getString("_UI_Specification_type") + " " + label;
+		String label = ((Specification) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_Specification_type") : //$NON-NLS-1$
+				getString("_UI_Specification_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -162,28 +140,25 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Specification.class)) {
-			case ReqIF10Package.SPECIFICATION__CHILDREN:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.SPECIFICATION__CHILDREN:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.SPECIFICATION__CHILDREN,
-				 ReqIF10Factory.eINSTANCE.createSpecHierarchy()));
+		newChildDescriptors
+				.add(createChildParameter(ReqIF10Package.Literals.SPECIFICATION__CHILDREN, ReqIF10Factory.eINSTANCE.createSpecHierarchy()));
 	}
 
 }
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecificationTypeItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecificationTypeItemProvider.java
index 966815b..cbfd361 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecificationTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/SpecificationTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -28,23 +27,16 @@
 import org.eclipse.rmf.reqif10.SpecificationType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.SpecificationType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.SpecificationType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class SpecificationTypeItemProvider
-	extends SpecTypeItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class SpecificationTypeItemProvider extends SpecTypeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecificationTypeItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +44,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,35 +58,32 @@
 	}
 
 	/**
-	 * This returns SpecificationType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns SpecificationType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SpecificationType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/SpecificationType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((SpecificationType)object).getLongName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_SpecificationType_type") :
-			getString("_UI_SpecificationType_type") + " " + label;
+		String label = ((SpecificationType) object).getLongName();
+		return label == null || label.length() == 0 ? getString("_UI_SpecificationType_type") : //$NON-NLS-1$
+				getString("_UI_SpecificationType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -105,10 +93,9 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/XhtmlContentItemProvider.java b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/XhtmlContentItemProvider.java
index f754854..3d58da6 100644
--- a/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/XhtmlContentItemProvider.java
+++ b/org.eclipse.rmf.reqif10.edit/src/org/eclipse/rmf/reqif10/provider/XhtmlContentItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -40,23 +39,16 @@
 import org.eclipse.rmf.reqif10.XhtmlContent;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.XhtmlContent} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.XhtmlContent} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlContentItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlContentItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlContentItemProvider(AdapterFactory adapterFactory) {
@@ -64,9 +56,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -80,33 +71,23 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Xhtml Source feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Xhtml Source feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addXhtmlSourcePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlContent_xhtmlSource_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlContent_xhtmlSource_feature", "_UI_XhtmlContent_type"),
-				 ReqIF10Package.Literals.XHTML_CONTENT__XHTML_SOURCE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlContent_xhtmlSource_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlContent_xhtmlSource_feature", "_UI_XhtmlContent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ReqIF10Package.Literals.XHTML_CONTENT__XHTML_SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -119,8 +100,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -132,35 +113,32 @@
 	}
 
 	/**
-	 * This returns XhtmlContent.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlContent.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlContent"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlContent")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlContent)object).getXhtmlSource();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlContent_type") :
-			getString("_UI_XhtmlContent_type") + " " + label;
+		String label = ((XhtmlContent) object).getXhtmlSource();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlContent_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlContent_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -168,227 +146,133 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlContent.class)) {
-			case ReqIF10Package.XHTML_CONTENT__XHTML_SOURCE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case ReqIF10Package.XHTML_CONTENT__XHTML:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case ReqIF10Package.XHTML_CONTENT__XHTML_SOURCE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case ReqIF10Package.XHTML_CONTENT__XHTML:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueXHTML()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createAttributeValueXHTML()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionXHTML()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionXHTML()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createReqIFContent()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, ReqIF10Factory.eINSTANCE.createReqIFContent()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createReqIF()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, ReqIF10Factory.eINSTANCE.createReqIF()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createReqIFHeader()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, ReqIF10Factory.eINSTANCE.createReqIFHeader()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createReqIFToolExtension()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createReqIFToolExtension()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createSpecObject()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, ReqIF10Factory.eINSTANCE.createSpecObject()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createSpecObjectType()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, ReqIF10Factory.eINSTANCE.createSpecObjectType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createSpecification()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, ReqIF10Factory.eINSTANCE.createSpecification()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createSpecificationType()));
+		newChildDescriptors
+				.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, ReqIF10Factory.eINSTANCE.createSpecificationType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createSpecHierarchy()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, ReqIF10Factory.eINSTANCE.createSpecHierarchy()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createSpecRelation()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, ReqIF10Factory.eINSTANCE.createSpecRelation()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createSpecRelationType()));
+		newChildDescriptors
+				.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, ReqIF10Factory.eINSTANCE.createSpecRelationType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createRelationGroup()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, ReqIF10Factory.eINSTANCE.createRelationGroup()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createRelationGroupType()));
+		newChildDescriptors
+				.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, ReqIF10Factory.eINSTANCE.createRelationGroupType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionXHTML()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionXHTML()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createAlternativeID()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, ReqIF10Factory.eINSTANCE.createAlternativeID()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionBoolean()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionBoolean()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionBoolean()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionBoolean()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueBoolean()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createAttributeValueBoolean()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionDate()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionDate()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionDate()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionDate()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueDate()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createAttributeValueDate()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionEnumeration()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionEnumeration()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionEnumeration()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionEnumeration()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createEnumValue()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, ReqIF10Factory.eINSTANCE.createEnumValue()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createEmbeddedValue()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, ReqIF10Factory.eINSTANCE.createEmbeddedValue()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueEnumeration()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createAttributeValueEnumeration()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionInteger()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionInteger()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionInteger()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionInteger()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueInteger()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createAttributeValueInteger()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionReal()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionReal()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionReal()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionReal()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueReal()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createAttributeValueReal()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createAttributeDefinitionString()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createAttributeDefinitionString()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createDatatypeDefinitionString()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createDatatypeDefinitionString()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createAttributeValueString()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
+				ReqIF10Factory.eINSTANCE.createAttributeValueString()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 ReqIF10Factory.eINSTANCE.createXhtmlContent()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, ReqIF10Factory.eINSTANCE.createXhtmlContent()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(ReqIF10Package.Literals.XHTML_CONTENT__XHTML,
-				 XMLTypeFactory.eINSTANCE.createAnyType()));
+		newChildDescriptors.add(createChildParameter(ReqIF10Package.Literals.XHTML_CONTENT__XHTML, XMLTypeFactory.eINSTANCE.createAnyType()));
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.excel.serialization/.gitignore b/org.eclipse.rmf.reqif10.excel.serialization/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.excel.serialization/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.rmf.reqif10.excel.serialization/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.excel.serialization/META-INF/MANIFEST.MF
index 0a8d453..0ddf4c4 100644
--- a/org.eclipse.rmf.reqif10.excel.serialization/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.excel.serialization/META-INF/MANIFEST.MF
@@ -2,6 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rmf.reqif10.excel.serialization
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.apache.poi;bundle-version="3.9.0",
+ org.eclipse.emf;bundle-version="2.6.0",
+ org.eclipse.rmf.reqif10;bundle-version="0.8.0"
+Export-Package: org.eclipse.rmf.reqif10.excel.serialization
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html b/org.eclipse.rmf.reqif10.excel.serialization/about.html
similarity index 99%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
copy to org.eclipse.rmf.reqif10.excel.serialization/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
+++ b/org.eclipse.rmf.reqif10.excel.serialization/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.excel.serialization/build.properties b/org.eclipse.rmf.reqif10.excel.serialization/build.properties
index 34d2e4d..af022dd 100644
--- a/org.eclipse.rmf.reqif10.excel.serialization/build.properties
+++ b/org.eclipse.rmf.reqif10.excel.serialization/build.properties
@@ -1,4 +1,17 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               about.html,\
+               epl-v10.html,\
+               notice.html
diff --git a/org.eclipse.rmf.examples.feature/epl-v10.html b/org.eclipse.rmf.reqif10.excel.serialization/epl-v10.html
similarity index 99%
copy from org.eclipse.rmf.examples.feature/epl-v10.html
copy to org.eclipse.rmf.reqif10.excel.serialization/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.examples.feature/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.excel.serialization/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/notice.html b/org.eclipse.rmf.reqif10.excel.serialization/notice.html
similarity index 97%
copy from org.eclipse.rmf.examples.feature/notice.html
copy to org.eclipse.rmf.reqif10.excel.serialization/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.examples.feature/notice.html
+++ b/org.eclipse.rmf.reqif10.excel.serialization/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.excel.serialization/src/org/eclipse/rmf/reqif10/excel/serialization/ExcelResource.java b/org.eclipse.rmf.reqif10.excel.serialization/src/org/eclipse/rmf/reqif10/excel/serialization/ExcelResource.java
new file mode 100644
index 0000000..8c7b101
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.excel.serialization/src/org/eclipse/rmf/reqif10/excel/serialization/ExcelResource.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.rmf.reqif10.excel.serialization;
+
+import org.eclipse.emf.ecore.resource.Resource;
+
+public interface ExcelResource extends Resource {
+
+}
diff --git a/org.eclipse.rmf.reqif10.excel.serialization/src/org/eclipse/rmf/reqif10/excel/serialization/ExcelResourceImpl.java b/org.eclipse.rmf.reqif10.excel.serialization/src/org/eclipse/rmf/reqif10/excel/serialization/ExcelResourceImpl.java
new file mode 100644
index 0000000..3e08b4e
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.excel.serialization/src/org/eclipse/rmf/reqif10/excel/serialization/ExcelResourceImpl.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.rmf.reqif10.excel.serialization;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Map;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.util.SheetUtil;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
+
+public class ExcelResourceImpl extends ResourceImpl implements ExcelResource {
+
+	public ExcelResourceImpl(URI uri) {
+		super(uri);
+	}
+
+	@Override
+	public EList<EObject> getContents() {
+		// TODO Auto-generated method stub
+		return super.getContents();
+	}
+
+	@Override
+	public EObject getEObject(String uriFragment) {
+		// TODO Auto-generated method stub
+		return super.getEObject(uriFragment);
+	}
+
+	@Override
+	protected void doSave(OutputStream outputStream, Map<?, ?> options)
+			throws IOException {
+		Workbook workbook = new HSSFWorkbook();
+		workbook.createSheet("FirstSheet");
+		workbook.write(outputStream);
+	}
+
+	@Override
+	protected void doLoad(InputStream inputStream, Map<?, ?> options)
+			throws IOException {
+		Workbook workbook = new HSSFWorkbook(inputStream);
+		System.out.println("Number of Sheets: " + workbook.getNumberOfSheets());
+	}
+
+	@Override
+	protected void doUnload() {
+		// TODO Auto-generated method stub
+		super.doUnload();
+	}
+	
+
+}
diff --git a/org.eclipse.rmf.reqif10.feature/about.properties b/org.eclipse.rmf.reqif10.feature/about.properties
index bed1240..3235b3f 100644
--- a/org.eclipse.rmf.reqif10.feature/about.properties
+++ b/org.eclipse.rmf.reqif10.feature/about.properties
@@ -1,3 +1,13 @@
+###############################################################################

+# Copyright (c) 2014 itemis AG and others.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     Mark Broerkens (itemis AG) - initial API and implementation

+###############################################################################

 blurb=Copyright (c) 2011 itemis GmbH, itemis AG\n\

 All rights reserved. This program and the accompanying materials\n\

 are made available under the terms of the Eclipse Public License v1.0\n\

diff --git a/org.eclipse.rmf.reqif10.feature/build.properties b/org.eclipse.rmf.reqif10.feature/build.properties
index f039bef..7b35999 100644
--- a/org.eclipse.rmf.reqif10.feature/build.properties
+++ b/org.eclipse.rmf.reqif10.feature/build.properties
@@ -1,14 +1,12 @@
-# Copyright (c) 2011 itemis GmbH.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     Nirmal Sasidharan - initial API and implementation

-bin.includes = feature.xml,\

-               feature.properties,\

-               epl-v10.html,\

-               license.html,\

-               notice.html,\

-               about.properties

+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.feature/epl-v10.html b/org.eclipse.rmf.reqif10.feature/epl-v10.html
deleted file mode 100644
index 813c07d..0000000
--- a/org.eclipse.rmf.reqif10.feature/epl-v10.html
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

diff --git a/org.eclipse.rmf.reqif10.feature/feature.properties b/org.eclipse.rmf.reqif10.feature/feature.properties
index 704ede0..a3080ab 100644
--- a/org.eclipse.rmf.reqif10.feature/feature.properties
+++ b/org.eclipse.rmf.reqif10.feature/feature.properties
@@ -1,131 +1,22 @@
-# "licenseURL" property - URL of the "Feature License"

-# do not translate value - just change to point to a locale-specific HTML page

-licenseURL=license.html

+# feature.properties

+# contains externalized strings for feature.xml

+# "%foo" in feature.xml corresponds to the key "foo" in this file

+# java.io.Properties file (ISO 8859-1 with "\\" escapes)

+# This file should be translated.

 

-# "license" property - text of the "Feature Update License"

-# should be plain text version of license agreement pointed to be "licenseURL"

-license=\

-Eclipse Foundation Software User Agreement\n\

-February 1, 2011\n\

-\n\

-Usage Of Content\n\

-\n\

-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\

-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\

-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\

-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\

-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\

-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\

-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\

-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\

-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\

-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\

-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\

-\n\

-Applicable Licenses\n\

-\n\

-Unless otherwise indicated, all Content made available by the\n\

-Eclipse Foundation is provided to you under the terms and conditions of\n\

-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\

-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\

-For purposes of the EPL, "Program" will mean the Content.\n\

-\n\

-Content includes, but is not limited to, source code, object code,\n\

-documentation and other files maintained in the Eclipse Foundation source code\n\

-repository ("Repository") in software modules ("Modules") and made available\n\

-as downloadable archives ("Downloads").\n\

-\n\

-       - Content may be structured and packaged into modules to facilitate delivering,\n\

-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\

-         plug-in fragments ("Fragments"), and features ("Features").\n\

-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\

-         in a directory named "plugins".\n\

-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\

-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\

-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\

-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\

-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\

-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\

-\n\

-The terms and conditions governing Plug-ins and Fragments should be\n\

-contained in files named "about.html" ("Abouts"). The terms and\n\

-conditions governing Features and Included Features should be contained\n\

-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\

-Licenses may be located in any directory of a Download or Module\n\

-including, but not limited to the following locations:\n\

-\n\

-       - The top-level (root) directory\n\

-       - Plug-in and Fragment directories\n\

-       - Inside Plug-ins and Fragments packaged as JARs\n\

-       - Sub-directories of the directory named "src" of certain Plug-ins\n\

-       - Feature directories\n\

-\n\

-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\

-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\

-Update License") during the installation process. If the Feature contains\n\

-Included Features, the Feature Update License should either provide you\n\

-with the terms and conditions governing the Included Features or inform\n\

-you where you can locate them. Feature Update Licenses may be found in\n\

-the "license" property of files named "feature.properties" found within a Feature.\n\

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\

-terms and conditions (or references to such terms and conditions) that\n\

-govern your use of the associated Content in that directory.\n\

-\n\

-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\

-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\

-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\

-\n\

-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\

-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\

-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\

-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\

-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\

-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\

-\n\

-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\

-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\

-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\

-govern that particular Content.\n\

-\n\

-\n\Use of Provisioning Technology\n\

-\n\

-The Eclipse Foundation makes available provisioning software, examples of which include,\n\

-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\

-the purpose of allowing users to install software, documentation, information and/or\n\

-other materials (collectively "Installable Software"). This capability is provided with\n\

-the intent of allowing such users to install, extend and update Eclipse-based products.\n\

-Information about packaging Installable Software is available at\n\

-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\

-\n\

-You may use Provisioning Technology to allow other parties to install Installable Software.\n\

-You shall be responsible for enabling the applicable license agreements relating to the\n\

-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\

-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\

-making it available in accordance with the Specification, you further acknowledge your\n\

-agreement to, and the acquisition of all necessary rights to permit the following:\n\

-\n\

-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\

-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\

-          extending or updating the functionality of an Eclipse-based product.\n\

-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\

-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\

-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\

-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\

-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\

-          with the Specification. Such Installable Software Agreement must inform the user of the\n\

-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\

-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\

-          indication of agreement by the user, the provisioning Technology will complete installation\n\

-          of the Installable Software.\n\

-\n\

-Cryptography\n\

-\n\

-Content may contain encryption software. The country in which you are\n\

-currently may have restrictions on the import, possession, and use,\n\

-and/or re-export to another country, of encryption software. BEFORE\n\

-using any encryption software, please check the country's laws,\n\

-regulations and policies concerning the import, possession, or use, and\n\

-re-export of encryption software, to see if this is permitted.\n\

-\n\

-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n

-########### end of license property ##########################################

+# "featureName" property - name of the feature

+featureName=RMF Core ReqIF Feature (Incubation)

+

+# "providerName" property - name of the company that provides the feature

+providerName=Eclipse Modeling Project

+

+# "updateSiteName" property - label for the update site

+

+# "description" property - description of the feature

+description=An EMF-based implementation of ReqIf 1.0.1

+

+# "copyright" property - text of the "Feature Update Copyright"

+

+

+

+

diff --git a/org.eclipse.rmf.reqif10.feature/feature.xml b/org.eclipse.rmf.reqif10.feature/feature.xml
index a8c63fb..81cdb39 100644
--- a/org.eclipse.rmf.reqif10.feature/feature.xml
+++ b/org.eclipse.rmf.reqif10.feature/feature.xml
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.rmf.reqif10.feature"
-      label="RMF Core ReqIF Feature (Incubation)"
-      version="0.9.0.qualifier"
-      provider-name="Eclipse Modeling Project"
-      plugin="org.eclipse.rmf.reqif10">
+      label="%featureName"
+      version="0.10.0.qualifier"
+      provider-name="%providerName"
+      plugin="org.eclipse.rmf.reqif10"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.1.qualifier">
 
    <description url="http://www.eclipse.org/rmf">
-      An EMF-based implementation of ReqIf 1.0.1
+      %description
    </description>
 
    <copyright url="http://itemis.com/">
-      Copyright (c) 2011 itemis GmbH.
+      Copyright (c) 2013 itemis AG and others.
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0
 which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-    Nirmal Sasidharan - initial API and implementation
    </copyright>
 
    <license url="%licenseURL">
@@ -64,4 +63,24 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.rmf.reqif10.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rmf.reqif10.xhtml.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rmf.reqif10.constraints"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>
diff --git a/org.eclipse.rmf.reqif10.feature/license.html b/org.eclipse.rmf.reqif10.feature/license.html
deleted file mode 100644
index 5ef6811..0000000
--- a/org.eclipse.rmf.reqif10.feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

diff --git a/org.eclipse.rmf.reqif10.feature/notice.html b/org.eclipse.rmf.reqif10.feature/notice.html
deleted file mode 100644
index 5ef6811..0000000
--- a/org.eclipse.rmf.reqif10.feature/notice.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

diff --git a/org.eclipse.rmf.reqif10.feature/pom.xml b/org.eclipse.rmf.reqif10.feature/pom.xml
index 941ebec..700d6b6 100644
--- a/org.eclipse.rmf.reqif10.feature/pom.xml
+++ b/org.eclipse.rmf.reqif10.feature/pom.xml
@@ -6,11 +6,32 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.reqif10.feature</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<packaging>eclipse-feature</packaging>

 	<groupId>org.eclipse.rmf.features</groupId>

+		<build>

+	<plugins>

+		<plugin>

+				<groupId>org.eclipse.tycho.extras</groupId>

+				<artifactId>tycho-source-feature-plugin</artifactId>

+				<version>${tycho.version}</version>

+				<executions>

+					<execution>

+						<id>source-feature</id>

+						<goals>

+							<goal>source-feature</goal>

+						</goals>

+						<configuration>

+							<excludes>

+								<feature id="org.eclipse.rmf.reqif10.thirdparty.feature"/>

+							</excludes>

+						</configuration>

+					</execution>

+				</executions>

+			</plugin>

+	</plugins>

+	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.edit/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.pror.edit/META-INF/MANIFEST.MF
index 1dabb8e..6357c32 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.pror.edit/META-INF/MANIFEST.MF
@@ -2,16 +2,15 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.reqif10.pror.edit;singleton:=true

-Bundle-Version: 0.9.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Bundle-ClassPath: .

 Bundle-Activator: org.eclipse.rmf.reqif10.pror.provider.Reqif10EditPlugin$Implementation

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Export-Package: org.eclipse.rmf.reqif10.pror.configuration.provider,

- org.eclipse.rmf.reqif10.pror.edit.presentation.service,

- org.eclipse.rmf.reqif10.pror.provider,

- org.eclipse.rmf.reqif10.pror.util

+Export-Package: org.eclipse.rmf.reqif10.pror.configuration.provider,or

+ g.eclipse.rmf.reqif10.pror.edit.presentation.service,org.eclipse.rmf.

+ reqif10.pror.provider,org.eclipse.rmf.reqif10.pror.util

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.edit;visibility:=reexport,

  org.eclipse.emf.ecore;visibility:=reexport,

diff --git a/org.eclipse.rmf.reqif10.pror.edit/about.html b/org.eclipse.rmf.reqif10.pror.edit/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/about.html
+++ b/org.eclipse.rmf.reqif10.pror.edit/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.edit/build.properties b/org.eclipse.rmf.reqif10.pror.edit/build.properties
index 774a84d..a816f3d 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/build.properties
+++ b/org.eclipse.rmf.reqif10.pror.edit/build.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,11 +7,15 @@
 #

 # Contributors:

 #     Michael Jastram - initial API and implementation

+###############################################################################

 bin.includes = .,\

                icons/,\

                META-INF/,\

                plugin.xml,\

-               plugin.properties

+               plugin.properties,\

+               about.html,\

+               epl-v10.html,\

+               notice.html

 jars.compile.order = .

 source.. = src/

 output.. = bin/

diff --git a/org.eclipse.rmf.reqif10.pror.edit/epl-v10.html b/org.eclipse.rmf.reqif10.pror.edit/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.pror.edit/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.edit/notice.html b/org.eclipse.rmf.reqif10.pror.edit/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/notice.html
+++ b/org.eclipse.rmf.reqif10.pror.edit/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.pror.edit/plugin.properties b/org.eclipse.rmf.reqif10.pror.edit/plugin.properties
index a1f5fed..00f946f 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/plugin.properties
+++ b/org.eclipse.rmf.reqif10.pror.edit/plugin.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,6 +7,8 @@
 #

 # Contributors:

 #     Michael Jastram - initial API and implementation

+###############################################################################

+

 pluginName = RMF ProR Edit Support (Incubation)

 providerName = Eclipse Modeling Project

 

diff --git a/org.eclipse.rmf.reqif10.pror.edit/plugin.xml b/org.eclipse.rmf.reqif10.pror.edit/plugin.xml
index ba79e8d..fc3348a 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/plugin.xml
+++ b/org.eclipse.rmf.reqif10.pror.edit/plugin.xml
@@ -20,15 +20,6 @@
 

    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

       <factory

-            uri="http://www.omg.org/spec/ReqIF/20110401/reqif.xsd"

-            class="org.eclipse.rmf.reqif10.pror.provider.ReqIF10ItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-      <factory

             class="org.eclipse.rmf.reqif10.pror.configuration.provider.ConfigurationItemProviderAdapterFactory"

             uri="http://eclipse.org/rmf/pror/toolextensions/1.0"

             supportedTypes=

diff --git a/org.eclipse.rmf.reqif10.pror.edit/pom.xml b/org.eclipse.rmf.reqif10.pror.edit/pom.xml
index 8ea40a7..0800ff3 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/pom.xml
+++ b/org.eclipse.rmf.reqif10.pror.edit/pom.xml
@@ -6,31 +6,13 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.reqif10.pror.edit</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

 	<groupId>org.eclipse.rmf.plugins</groupId>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

- 	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.eclipse.tycho</groupId>

-				<artifactId>tycho-source-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<executions>

-					<execution>

-						<id>plugin-source</id>

-						<goals>

-							<goal>plugin-source</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ColumnItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ColumnItemProvider.java
index 77ce4ad..e58a1ce 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ColumnItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ColumnItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ConfigurationItemProviderAdapterFactory.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ConfigurationItemProviderAdapterFactory.java
index ffde4b9..0ebe33d 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ConfigurationItemProviderAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ConfigurationItemProviderAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/LabelConfigurationItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/LabelConfigurationItemProvider.java
index bf5e96d..6c26080 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/LabelConfigurationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/LabelConfigurationItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrGeneralConfigurationItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrGeneralConfigurationItemProvider.java
index 353fc89..c648e7e 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrGeneralConfigurationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrGeneralConfigurationItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrPresentationConfigurationItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrPresentationConfigurationItemProvider.java
index de380ae..c5673b9 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrPresentationConfigurationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrPresentationConfigurationItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2014 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -11,13 +11,16 @@
 

 package org.eclipse.rmf.reqif10.pror.configuration.provider;

 

-

 import java.util.Collection;

+import java.util.Collections;

+import java.util.HashSet;

 import java.util.List;

+import java.util.Set;

 

 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.domain.EditingDomain;

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

 import org.eclipse.emf.edit.provider.IItemLabelProvider;

@@ -28,10 +31,10 @@
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;

 import org.eclipse.emf.edit.provider.ViewerNotification;

 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationPackage;

+import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;

 import org.eclipse.rmf.reqif10.pror.provider.Reqif10EditPlugin;

 import org.eclipse.rmf.reqif10.pror.util.PresentationEditInterface;

 

-

 /**

  * This is the item provider adapter for a

  * {@link org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration}

@@ -51,6 +54,34 @@
 		IItemLabelProvider,

 		IItemPropertySource,

 		PresentationEditInterface {

+

+	// Track the registered configs.

+	private Set<ProrPresentationConfiguration> registeredConfigs = 

+			new HashSet<ProrPresentationConfiguration>();

+

+	/**

+	 * If you override these, please call super to ensure that configs are tracked.

+	 */

+	public void registerPresentationConfiguration(ProrPresentationConfiguration config,

+			EditingDomain editingDomain) {

+		registeredConfigs.add(config);

+	}

+

+	/**

+	 * If you override these, please call super to ensure that configs are tracked.

+	 */

+	public void unregisterPresentationConfiguration(ProrPresentationConfiguration config) {

+		registeredConfigs.remove(config);

+	}

+	

+	/**

+	 * @return an unmodifiable {@link Set} of all currently registered

+	 * {@link ProrPresentationConfiguration}s.

+	 */

+	public Set<ProrPresentationConfiguration> getRegisteredConfigurations() {

+		return Collections.unmodifiableSet(registeredConfigs);

+	}

+

 	/**

 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrPresentationConfigurationsItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrPresentationConfigurationsItemProvider.java
index 70f4862..2f7d87d 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrPresentationConfigurationsItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrPresentationConfigurationsItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrSpecViewConfigurationItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrSpecViewConfigurationItemProvider.java
index 9fcc2a5..4aed386 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrSpecViewConfigurationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrSpecViewConfigurationItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrToolExtensionItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrToolExtensionItemProvider.java
index f41e1aa..3b39082 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrToolExtensionItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrToolExtensionItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/edit/presentation/service/PresentationInterface.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/edit/presentation/service/PresentationInterface.java
index 91d6cb2..baf4a88 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/edit/presentation/service/PresentationInterface.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/edit/presentation/service/PresentationInterface.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/edit/presentation/service/PresentationManager.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/edit/presentation/service/PresentationManager.java
index 74a5fcd..511ed8d 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/edit/presentation/service/PresentationManager.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/edit/presentation/service/PresentationManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AlternativeIDItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AlternativeIDItemProvider.java
index f983f01..cb7d511 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AlternativeIDItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AlternativeIDItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionBooleanItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionBooleanItemProvider.java
index 7b1b275..4ccb4a6 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionBooleanItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionBooleanItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionDateItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionDateItemProvider.java
index 7bb3fe0..289cede 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionDateItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionDateItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionEnumerationItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionEnumerationItemProvider.java
index 79997dc..ffc865b 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionEnumerationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionEnumerationItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionIntegerItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionIntegerItemProvider.java
index e2f1190..158251d 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionIntegerItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionIntegerItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionItemProvider.java
index 5f675e8..f0c9719 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionRealItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionRealItemProvider.java
index a70ab97..f531109 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionRealItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionRealItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionStringItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionStringItemProvider.java
index 5408ee1..905c3c8 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionStringItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionStringItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionXHTMLItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionXHTMLItemProvider.java
index 77be7b1..3322c81 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionXHTMLItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeDefinitionXHTMLItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueBooleanItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueBooleanItemProvider.java
index 6abe83b..33a6ed1 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueBooleanItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueBooleanItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueDateItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueDateItemProvider.java
index 1cf24b3..e42cee9 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueDateItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueDateItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueEnumerationItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueEnumerationItemProvider.java
index 9dc8c97..8c43fdc 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueEnumerationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueEnumerationItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueIntegerItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueIntegerItemProvider.java
index 98f91d9..7c2fec7 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueIntegerItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueIntegerItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueItemProvider.java
index 2a3b8d6..fa94760 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueRealItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueRealItemProvider.java
index f6be6c5..234b259 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueRealItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueRealItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueSimpleItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueSimpleItemProvider.java
index c31019a..bf31d08 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueSimpleItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueSimpleItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueStringItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueStringItemProvider.java
index af67eda..4ad52e1 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueStringItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueStringItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueXHTMLItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueXHTMLItemProvider.java
index 1e54b9e..af06a18 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueXHTMLItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/AttributeValueXHTMLItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionBooleanItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionBooleanItemProvider.java
index 5bc53db..cebb9af 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionBooleanItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionBooleanItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionDateItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionDateItemProvider.java
index f72bf08..fc9b788 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionDateItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionDateItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionEnumerationItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionEnumerationItemProvider.java
index ce80deb..93fe920 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionEnumerationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionEnumerationItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionIntegerItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionIntegerItemProvider.java
index a9f2872..17fcef9 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionIntegerItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionIntegerItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionItemProvider.java
index 3ba95fa..497a7da 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionRealItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionRealItemProvider.java
index de9b01e..5e74281 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionRealItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionRealItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionSimpleItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionSimpleItemProvider.java
index 798026c..6897698 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionSimpleItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionSimpleItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionStringItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionStringItemProvider.java
index 855ec7e..9fa4228 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionStringItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionStringItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionXHTMLItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionXHTMLItemProvider.java
index ea34ce1..aacea54 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionXHTMLItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/DatatypeDefinitionXHTMLItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/EmbeddedValueItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/EmbeddedValueItemProvider.java
index 839a082..d17b9c1 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/EmbeddedValueItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/EmbeddedValueItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/EnumValueItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/EnumValueItemProvider.java
index 54d5283..d347342 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/EnumValueItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/EnumValueItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/IdentifiableItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/IdentifiableItemProvider.java
index f575458..16bc604 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/IdentifiableItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/IdentifiableItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/RelationGroupItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/RelationGroupItemProvider.java
index 871342c..07bfd5e 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/RelationGroupItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/RelationGroupItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/RelationGroupTypeItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/RelationGroupTypeItemProvider.java
index 90f7d21..cfb2d7b 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/RelationGroupTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/RelationGroupTypeItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIF10ItemProviderAdapterFactory.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIF10ItemProviderAdapterFactory.java
index e04fc14..cc17f2a 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIF10ItemProviderAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIF10ItemProviderAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIFContentItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIFContentItemProvider.java
index a951d2c..bda6ee3 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIFContentItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIFContentItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIFHeaderItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIFHeaderItemProvider.java
index 46533e4..a2d0eae 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIFHeaderItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIFHeaderItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIFItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIFItemProvider.java
index e44ff50..21fef0e 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIFItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIFItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIFToolExtensionItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIFToolExtensionItemProvider.java
index e0b3e5a..eb4ec54 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIFToolExtensionItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/ReqIFToolExtensionItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/Reqif10EditPlugin.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/Reqif10EditPlugin.java
index 21ff1e0..e2d9057 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/Reqif10EditPlugin.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/Reqif10EditPlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecElementWithAttributesItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecElementWithAttributesItemProvider.java
index 01d7411..caecbaa 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecElementWithAttributesItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecElementWithAttributesItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecHierarchyItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecHierarchyItemProvider.java
index af82dd1..7d10b28 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecHierarchyItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecHierarchyItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecObjectItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecObjectItemProvider.java
index 3699055..3b62a08 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecObjectItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecObjectItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecObjectTypeItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecObjectTypeItemProvider.java
index c9a89d1..d9f27ca 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecObjectTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecObjectTypeItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecRelationItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecRelationItemProvider.java
index 8fe9f04..4877e7e 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecRelationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecRelationItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecRelationTypeItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecRelationTypeItemProvider.java
index a9aa8d3..50be04e 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecRelationTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecRelationTypeItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecTypeItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecTypeItemProvider.java
index 3524995..718e9ec 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecTypeItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecificationItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecificationItemProvider.java
index ca9ad48..474b019 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecificationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecificationItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecificationTypeItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecificationTypeItemProvider.java
index 3a75286..4d5c41a 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecificationTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/SpecificationTypeItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/TransientReqIFItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/TransientReqIFItemProvider.java
index e62d66c..1c2b74b 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/TransientReqIFItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/TransientReqIFItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualDatatypeDefinitionItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualDatatypeDefinitionItemProvider.java
index 3284636..de2e486 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualDatatypeDefinitionItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualDatatypeDefinitionItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecObjectItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecObjectItemProvider.java
index bc31589..7df7892 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecObjectItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecObjectItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecRelationGroupItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecRelationGroupItemProvider.java
index a49b263..1069553 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecRelationGroupItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecRelationGroupItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecRelationsItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecRelationsItemProvider.java
index a5955d6..d77ea08 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecRelationsItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecRelationsItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecTypeItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecTypeItemProvider.java
index 1cdfea2..92093e4 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecTypeItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecificationsItemProvider.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecificationsItemProvider.java
index 418d2ed..d28e1bf 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecificationsItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/provider/VirtualSpecificationsItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/CompoundCommandActionDelegate.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/CompoundCommandActionDelegate.java
index 0135eac..2e1adfa 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/CompoundCommandActionDelegate.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/CompoundCommandActionDelegate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/ConfigurationUtil.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/ConfigurationUtil.java
index e2dbed5..8b14321 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/ConfigurationUtil.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/ConfigurationUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/PresentationEditInterface.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/PresentationEditInterface.java
index 2f2d2c2..96d98dd 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/PresentationEditInterface.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/PresentationEditInterface.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2012, 2013 Formal Mind GmbH and University of Dusseldorf.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/ProrUtil.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/ProrUtil.java
index 2e3feb5..e8dfcac 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/ProrUtil.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/ProrUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -37,6 +37,7 @@
 import org.eclipse.emf.edit.command.RemoveCommand;

 import org.eclipse.emf.edit.command.SetCommand;

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.ComposedImage;

 import org.eclipse.emf.edit.provider.IItemLabelProvider;

 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

@@ -206,6 +207,11 @@
 	 */

 	public static ItemProviderAdapter getItemProvider(

 			AdapterFactory adapterFactory, Object object) {

+		if (adapterFactory instanceof ComposeableAdapterFactory) {

+			adapterFactory = ((ComposeableAdapterFactory) adapterFactory)

+					.getRootAdapterFactory();

+		}

+

 		// Workaround - we simply try to retrieve an IItemLabelProvider.

 		return (ItemProviderAdapter) adapterFactory.adapt(object,

 				IItemLabelProvider.class);

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/ProrXhtmlSimplifiedHelper.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/ProrXhtmlSimplifiedHelper.java
index 3ae3f68..5ce9c86 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/ProrXhtmlSimplifiedHelper.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/ProrXhtmlSimplifiedHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor.tests/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.pror.editor.tests/META-INF/MANIFEST.MF
index a65abd5..6e0f93c 100644
--- a/org.eclipse.rmf.reqif10.pror.editor.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.pror.editor.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EditorTests
 Bundle-SymbolicName: org.eclipse.rmf.reqif10.pror.editor.tests
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Fragment-Host: org.eclipse.rmf.reqif10.pror.editor;bundle-version="0.9.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.junit,
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html b/org.eclipse.rmf.reqif10.pror.editor.tests/about.html
similarity index 99%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
copy to org.eclipse.rmf.reqif10.pror.editor.tests/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
+++ b/org.eclipse.rmf.reqif10.pror.editor.tests/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.editor.tests/build.properties b/org.eclipse.rmf.reqif10.pror.editor.tests/build.properties
index 34d2e4d..654aaac 100644
--- a/org.eclipse.rmf.reqif10.pror.editor.tests/build.properties
+++ b/org.eclipse.rmf.reqif10.pror.editor.tests/build.properties
@@ -1,4 +1,17 @@
+###############################################################################
+# Copyright (c) 2014 Formal Mind GmbH, University of Duesseldorf and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Michael Jastram - initial API and implementation
+###############################################################################
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               about.html,\
+               epl-v10.html,\
+               notice.html
diff --git a/org.eclipse.rmf.examples.feature/epl-v10.html b/org.eclipse.rmf.reqif10.pror.editor.tests/epl-v10.html
similarity index 99%
copy from org.eclipse.rmf.examples.feature/epl-v10.html
copy to org.eclipse.rmf.reqif10.pror.editor.tests/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.examples.feature/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.pror.editor.tests/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/notice.html b/org.eclipse.rmf.reqif10.pror.editor.tests/notice.html
similarity index 97%
copy from org.eclipse.rmf.examples.feature/notice.html
copy to org.eclipse.rmf.reqif10.pror.editor.tests/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.examples.feature/notice.html
+++ b/org.eclipse.rmf.reqif10.pror.editor.tests/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.pror.editor.tests/pom.xml b/org.eclipse.rmf.reqif10.pror.editor.tests/pom.xml
index 56193ce..c75ceed 100644
--- a/org.eclipse.rmf.reqif10.pror.editor.tests/pom.xml
+++ b/org.eclipse.rmf.reqif10.pror.editor.tests/pom.xml
@@ -6,12 +6,11 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<groupId>org.eclipse.rmf.plugins</groupId>

 	<artifactId>org.eclipse.rmf.reqif10.pror.editor.tests</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

@@ -46,7 +45,7 @@
 			<plugin>

 				<groupId>org.eclipse.tycho</groupId>

 				<artifactId>tycho-surefire-plugin</artifactId>

-				<version>${tycho-version}</version>

+				<version>${tycho.version}</version>

 				<configuration>

 					<includes>

 						<include>**/All*Tests.class</include>

@@ -58,7 +57,7 @@
 			</plugin>

 			<plugin>

 				<artifactId>maven-antrun-plugin</artifactId>

-				<version>${antrun-version}</version>

+				<version>${antrun.version}</version>

 				<executions>

 					<execution>

 						<id>generate-commit-id</id>

diff --git a/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractContentProviderTests.java b/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractContentProviderTests.java
index fb3b5ef..a36fa20 100644
--- a/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractContentProviderTests.java
+++ b/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractContentProviderTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AllCachingTests.java b/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AllCachingTests.java
index 3fd1c14..3dffefc 100755
--- a/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AllCachingTests.java
+++ b/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AllCachingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/CachingTests.java b/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/CachingTests.java
index d9ac33f..119d747 100644
--- a/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/CachingTests.java
+++ b/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/CachingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ContentProviderBasicTests.java b/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ContentProviderBasicTests.java
index f2bd501..f35174d 100644
--- a/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ContentProviderBasicTests.java
+++ b/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ContentProviderBasicTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrRowTests.java b/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrRowTests.java
index 012553f..7645e9a 100644
--- a/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrRowTests.java
+++ b/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrRowTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.reqif10.pror.editor/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.pror.editor/META-INF/MANIFEST.MF
index df7ecdd..8e1b74f 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.pror.editor/META-INF/MANIFEST.MF
@@ -2,16 +2,15 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.reqif10.pror.editor;singleton:=true

-Bundle-Version: 0.9.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Bundle-Activator: org.eclipse.rmf.reqif10.pror.editor.presentation.Reqif10EditorPlugin$Implementation

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Export-Package: org.eclipse.rmf.reqif10.pror.editor.agilegrid,

- org.eclipse.rmf.reqif10.pror.editor.presentation,

- org.eclipse.rmf.reqif10.pror.editor.presentation.service,

- org.eclipse.rmf.reqif10.pror.editor.propertiesview,

- org.eclipse.rmf.reqif10.pror.editor.util

+Export-Package: org.eclipse.rmf.reqif10.pror.editor.agilegrid,org.ecli

+ pse.rmf.reqif10.pror.editor.presentation,org.eclipse.rmf.reqif10.pror

+ .editor.presentation.service,org.eclipse.rmf.reqif10.pror.editor.prop

+ ertiesview,org.eclipse.rmf.reqif10.pror.editor.util

 Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,

  org.eclipse.ui.ide;visibility:=reexport,

  org.eclipse.ui.forms,

@@ -24,5 +23,6 @@
  com.google.guava,

  org.eclipse.core.filesystem;bundle-version="1.3.100",

  org.eclipse.rmf.reqif10.xhtml;bundle-version="0.9.0",

- org.eclipse.rmf.reqif10.serialization;bundle-version="0.9.0"

+ org.eclipse.rmf.reqif10.serialization;bundle-version="0.9.0",

+ org.eclipse.rmf.reqif10.xhtml.edit;bundle-version="0.9.0"

 Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.rmf.reqif10.pror.editor/about.html b/org.eclipse.rmf.reqif10.pror.editor/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/about.html
+++ b/org.eclipse.rmf.reqif10.pror.editor/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.editor/build.properties b/org.eclipse.rmf.reqif10.pror.editor/build.properties
index 6764581..4f75723 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/build.properties
+++ b/org.eclipse.rmf.reqif10.pror.editor/build.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,6 +7,8 @@
 #

 # Contributors:

 #     Michael Jastram - initial API and implementation

+###############################################################################

+

 bin.includes = .,\

                icons/,\

                META-INF/,\

@@ -13,7 +16,10 @@
                plugin.properties,\

                pror-mime.xml,\

                pror.desktop,\

-               schema/

+               schema/,\

+               about.html,\

+               epl-v10.html,\

+               notice.html

 output.. = bin/

 jars.compile.order = .

 source.. = src/

diff --git a/org.eclipse.rmf.reqif10.pror.editor/epl-v10.html b/org.eclipse.rmf.reqif10.pror.editor/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.pror.editor/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.editor/notice.html b/org.eclipse.rmf.reqif10.pror.editor/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/notice.html
+++ b/org.eclipse.rmf.reqif10.pror.editor/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.pror.editor/plugin.properties b/org.eclipse.rmf.reqif10.pror.editor/plugin.properties
index 9bec74f..74582bd 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/plugin.properties
+++ b/org.eclipse.rmf.reqif10.pror.editor/plugin.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,6 +7,8 @@
 #

 # Contributors:

 #     Michael Jastram - initial API and implementation

+###############################################################################

+

 pluginName = RMF ProR Editor (Incubation)

 providerName = Eclipse Modeling Project

 

diff --git a/org.eclipse.rmf.reqif10.pror.editor/plugin.xml b/org.eclipse.rmf.reqif10.pror.editor/plugin.xml
index be6230a..272d52c 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/plugin.xml
+++ b/org.eclipse.rmf.reqif10.pror.editor/plugin.xml
@@ -204,13 +204,6 @@
     </perspectiveExtension>

  </extension>

  <extension

-       point="org.eclipse.emf.ecore.extension_parser">

-    <parser

-          class="org.eclipse.rmf.reqif10.serialization.ReqIF10ResourceFactoryImpl"

-          type="reqif">

-    </parser>

- </extension>

- <extension

        point="org.eclipse.ui.navigator.navigatorContent">

     <commonWizard

           type="new"

diff --git a/org.eclipse.rmf.reqif10.pror.editor/pom.xml b/org.eclipse.rmf.reqif10.pror.editor/pom.xml
index 477bf3e..26eb191 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/pom.xml
+++ b/org.eclipse.rmf.reqif10.pror.editor/pom.xml
@@ -6,31 +6,13 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.reqif10.pror.editor</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

 	<groupId>org.eclipse.rmf.plugins</groupId>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

- 	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.eclipse.tycho</groupId>

-				<artifactId>tycho-source-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<executions>

-					<execution>

-						<id>plugin-source</id>

-						<goals>

-							<goal>plugin-source</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

-</project>
\ No newline at end of file
+	</project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/AddTestObjectsActionDelegate.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/AddTestObjectsActionDelegate.java
index ffa8990..6ae603f 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/AddTestObjectsActionDelegate.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/AddTestObjectsActionDelegate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/ColumnConfigurationActionDelegate.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/ColumnConfigurationActionDelegate.java
index 1adebfd..bd443d6 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/ColumnConfigurationActionDelegate.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/ColumnConfigurationActionDelegate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/DatatypeConfigurationActionDelegate.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/DatatypeConfigurationActionDelegate.java
index eb96f02..dfa0342 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/DatatypeConfigurationActionDelegate.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/DatatypeConfigurationActionDelegate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/GeneralConfigurationActionDelegate.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/GeneralConfigurationActionDelegate.java
index 050d802..ea6b7d8 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/GeneralConfigurationActionDelegate.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/GeneralConfigurationActionDelegate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/NewReqifWizardAction.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/NewReqifWizardAction.java
index ded6550..545b3f8 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/NewReqifWizardAction.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/NewReqifWizardAction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/PresentationConfigurationActionDelegate.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/PresentationConfigurationActionDelegate.java
index f6820e6..c06093b 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/PresentationConfigurationActionDelegate.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/PresentationConfigurationActionDelegate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/ShiftLevelDownActionDelegate.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/ShiftLevelDownActionDelegate.java
index e6e4b01..7d98aea 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/ShiftLevelDownActionDelegate.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/ShiftLevelDownActionDelegate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/ShiftLevelUpActionDelegate.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/ShiftLevelUpActionDelegate.java
index 4270886..15e5db4 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/ShiftLevelUpActionDelegate.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/ShiftLevelUpActionDelegate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/SpecificationWebPrintAction.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/SpecificationWebPrintAction.java
index 7591036..25247f2 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/SpecificationWebPrintAction.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/SpecificationWebPrintAction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/SubtreeDialog.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/SubtreeDialog.java
index 7e51eac..287df31 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/SubtreeDialog.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/SubtreeDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/ToggleSpecRelationsActionDelegate.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/ToggleSpecRelationsActionDelegate.java
index afded24..f4e6339 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/ToggleSpecRelationsActionDelegate.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/ToggleSpecRelationsActionDelegate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/WebsiteActionDelegate.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/WebsiteActionDelegate.java
index 81dc678..ff56d7f 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/WebsiteActionDelegate.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/actions/WebsiteActionDelegate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrCellEditorProvider.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrCellEditorProvider.java
index 6e4fd4f..742b694 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrCellEditorProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrCellEditorProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrCellRenderer.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrCellRenderer.java
index 6549c57..a509e92 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrCellRenderer.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrCellRenderer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -12,10 +12,9 @@
 

 import java.text.DateFormat;

 import java.util.Date;

+import java.util.GregorianCalendar;

 import java.util.List;

 

-import javax.xml.datatype.XMLGregorianCalendar;

-

 import org.agilemore.agilegrid.AgileGrid;

 import org.agilemore.agilegrid.Cell;

 import org.agilemore.agilegrid.IContentProvider;

@@ -33,7 +32,6 @@
 import org.eclipse.rmf.reqif10.pror.util.ProrUtil;

 import org.eclipse.rmf.reqif10.pror.util.ProrXhtmlSimplifiedHelper;

 import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.GC;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.graphics.Point;

@@ -88,9 +86,9 @@
 		if (value instanceof AttributeValue) {

 			defaultValue = ((AttributeValue) value).eContainer() == null;

 			Object v = ReqIF10Util.getTheValue((AttributeValue) value);

-			if (v instanceof XMLGregorianCalendar) {

-				XMLGregorianCalendar cal = (XMLGregorianCalendar) v;

-				Date date = cal.toGregorianCalendar().getTime();

+			if (v instanceof GregorianCalendar) {

+				GregorianCalendar cal = (GregorianCalendar) v;

+				Date date = cal.getTime();

 				stringValue = DateFormat.getDateInstance().format(date);

 			} else if (v instanceof List<?>) {

 				stringValue = convertListToString((List<?>) v);

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrSpecCellRenderer.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrSpecCellRenderer.java
index 34a2d00..e8c6814 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrSpecCellRenderer.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrSpecCellRenderer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AgileCellEditorActionHandler.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AgileCellEditorActionHandler.java
index 6daadf9..72ace9b 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AgileCellEditorActionHandler.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AgileCellEditorActionHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrAgileGrid.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrAgileGrid.java
index 8ff3ad3..33ebcf9 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrAgileGrid.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrAgileGrid.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrAgileGridContentProvider.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrAgileGridContentProvider.java
index 878b146..9854746 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrAgileGridContentProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrAgileGridContentProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrAgileGridViewer.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrAgileGridViewer.java
index d875203..5bc4215 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrAgileGridViewer.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrAgileGridViewer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -84,6 +84,7 @@
 import org.eclipse.swt.widgets.Control;

 import org.eclipse.swt.widgets.Menu;

 import org.eclipse.swt.widgets.Widget;

+import org.eclipse.ui.part.PluginTransfer;

 

 /**

  * A Viewer that manages an {@link AgileGrid} rendering a

@@ -673,7 +674,7 @@
 	private void enableDragNDrop() {

 		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

 		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(),

-				LocalSelectionTransfer.getTransfer() };

+				LocalSelectionTransfer.getTransfer(), PluginTransfer.getInstance() };

 		addDragSupport(dndOperations, transfers, new ViewerDragAdapter(this) {

 

 			// Modified to allow resizing of columns

@@ -752,7 +753,7 @@
 						} else if (row instanceof ProrRowSpecRelation) {

 							target = row.getSpecElement();

 						}

-

+						

 						if (target instanceof SpecHierarchy) {

 							dragTarget = (SpecHierarchy) target;

 							float location = getLocation(e);

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellEditor.java
index 0c18abc..171a949 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellEditorProvider.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellEditorProvider.java
index 5109883..d43fae0 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellEditorProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellEditorProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellRenderer.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellRenderer.java
index 28e744a..3ec11a2 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellRenderer.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellRenderer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellRendererProvider.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellRendererProvider.java
index aa33837..ab9cc4e 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellRendererProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellRendererProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCheckboxCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCheckboxCellEditor.java
index bc45269..b75abe7 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCheckboxCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCheckboxCellEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrDateCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrDateCellEditor.java
index 251b8e9..ba1cab1 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrDateCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrDateCellEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -16,8 +16,6 @@
 import java.util.GregorianCalendar;

 

 import javax.xml.datatype.DatatypeConfigurationException;

-import javax.xml.datatype.DatatypeFactory;

-import javax.xml.datatype.XMLGregorianCalendar;

 

 import org.agilemore.agilegrid.AgileGrid;

 import org.agilemore.agilegrid.ICellEditorValidator;

@@ -38,7 +36,7 @@
 					return null;

 				}

 				try {

-					ProrDateCellEditor.this.stingToCalendar(value.toString());

+					ReqIF10Util.stingToCalendar(value.toString());

 				} catch (ParseException e) {

 					return "Required Format: "

 							+ DateFormat.getDateInstance().format(new Date());

@@ -53,7 +51,7 @@
 	@Override

 	protected Object doGetValue() {

 		try {

-			XMLGregorianCalendar value = stingToCalendar(text.getText());

+			GregorianCalendar value = ReqIF10Util.stingToCalendar(text.getText());

 			ProrUtil.setTheValue(attributeValue, value, parent, affectedObject,

 					editingDomain);

 		} catch (ParseException e) {

@@ -72,23 +70,10 @@
 			attributeValue = (AttributeValue) value;

 

 			Object cal = ReqIF10Util.getTheValue(attributeValue);

-			if (cal instanceof XMLGregorianCalendar) {

+			if (cal instanceof GregorianCalendar) {

 				text.setText(DateFormat.getDateInstance().format(

-						((XMLGregorianCalendar) cal).toGregorianCalendar()

-								.getTime()));

+						((GregorianCalendar) cal).getTime()));

 			}

 		}

 	}

-

-	/**

-	 * Helper that converts String to {@link XMLGregorianCalendar}. We use this

-	 * for Validation and for setting.

-	 */

-	private XMLGregorianCalendar stingToCalendar(String value)

-			throws ParseException, DatatypeConfigurationException {

-		Date date = DateFormat.getDateInstance().parse(value.toString());

-		GregorianCalendar cal = new GregorianCalendar();

-		cal.setTime(date);

-		return DatatypeFactory.newInstance().newXMLGregorianCalendar(cal);

-	}

 }

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrEnumerationMultiValueCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrEnumerationMultiValueCellEditor.java
index 9dd8f98..cda6641 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrEnumerationMultiValueCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrEnumerationMultiValueCellEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrEnumerationSingleValueCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrEnumerationSingleValueCellEditor.java
index 7913d0d..f19db09 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrEnumerationSingleValueCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrEnumerationSingleValueCellEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrIntegerCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrIntegerCellEditor.java
index da2b463..b586f01 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrIntegerCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrIntegerCellEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrLayoutAdvisor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrLayoutAdvisor.java
index 5f8794c..2e6ed08 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrLayoutAdvisor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrLayoutAdvisor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrLinkCellRenderer.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrLinkCellRenderer.java
index aca6dea..5de6128 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrLinkCellRenderer.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrLinkCellRenderer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrRealCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrRealCellEditor.java
index 4d6f893..7f4f143 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrRealCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrRealCellEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrRow.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrRow.java
index 337c75b..46ae98f 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrRow.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrRow.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrStringCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrStringCellEditor.java
index 4135820..9b049a9 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrStringCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrStringCellEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrXhtmlSimplifiedCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrXhtmlSimplifiedCellEditor.java
index e91ca7b..4aff5ea 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrXhtmlSimplifiedCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrXhtmlSimplifiedCellEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/preferences/PreferenceConstants.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/preferences/PreferenceConstants.java
index a2bbea8..5b9363c 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/preferences/PreferenceConstants.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/preferences/PreferenceConstants.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/preferences/PreferenceInitializer.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/preferences/PreferenceInitializer.java
index 2363014..aaa43c0 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/preferences/PreferenceInitializer.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/preferences/PreferenceInitializer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/preferences/ProRPreferencePage.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/preferences/ProRPreferencePage.java
index 2783c28..dfb9e85 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/preferences/ProRPreferencePage.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/preferences/ProRPreferencePage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/preferences/ProrDefaultPresentationPage.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/preferences/ProrDefaultPresentationPage.java
index 2fbd844..b216e67 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/preferences/ProrDefaultPresentationPage.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/preferences/ProrDefaultPresentationPage.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Formal Mind GmbH, University of Duesseldorf and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Michael Jastram - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.reqif10.pror.editor.preferences;
 
 import java.util.Map;
diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ProrAdapterFactoryContentProvider.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ProrAdapterFactoryContentProvider.java
index 94e8412..93e857e 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ProrAdapterFactoryContentProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ProrAdapterFactoryContentProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ProrPerspective.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ProrPerspective.java
index 4ff8f77..2ebf190 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ProrPerspective.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ProrPerspective.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10ActionBarContributor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10ActionBarContributor.java
index 95f89c6..6a3e2ad 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10ActionBarContributor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10ActionBarContributor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10Editor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10Editor.java
index 7daaee0..3b55c3c 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10Editor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10Editor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -21,6 +21,7 @@
 import java.util.HashMap;

 import java.util.Iterator;

 import java.util.LinkedHashMap;

+import java.util.List;

 import java.util.Map;

 

 import org.eclipse.core.resources.IFile;

@@ -111,6 +112,7 @@
 import org.eclipse.rmf.reqif10.pror.provider.VirtualDatatypeDefinitionItemProvider;

 import org.eclipse.rmf.reqif10.pror.provider.VirtualSpecTypeItemProvider;

 import org.eclipse.rmf.reqif10.pror.util.ConfigurationUtil;

+import org.eclipse.rmf.reqif10.xhtml.provider.XhtmlItemProviderAdapterFactory;

 import org.eclipse.rmf.serialization.XMLPersistenceMappingResource;

 import org.eclipse.rmf.serialization.XMLPersistenceMappingResourceSetImpl;

 import org.eclipse.swt.SWT;

@@ -698,11 +700,12 @@
 	 * This sets up the editing domain for the model editor. <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

 	 * 

-	 * @generated

+	 * @generated NOT

 	 */

 	protected void initializeEditingDomain() {

 		// Create an adapter factory that yields item providers.

 		//

+		

 		adapterFactory = new ComposedAdapterFactory(

 				ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

 

@@ -711,10 +714,13 @@
 		adapterFactory

 				.addAdapterFactory(new ReqIF10ItemProviderAdapterFactory());

 		adapterFactory

+		        .addAdapterFactory(new XhtmlItemProviderAdapterFactory());

+		adapterFactory

 				.addAdapterFactory(new ConfigurationItemProviderAdapterFactory());

 		adapterFactory

 				.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

 

+

 		// Create the command stack that will notify this editor as commands are

 		// executed.

 		//

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10EditorPlugin.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10EditorPlugin.java
index 4eaec13..fed87c2 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10EditorPlugin.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10EditorPlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10ModelWizard.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10ModelWizard.java
index e7ee4d3..a207273 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10ModelWizard.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10ModelWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ReqifMainForm.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ReqifMainForm.java
index 7e77180..f08d160 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ReqifMainForm.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ReqifMainForm.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ReqifSpecificationEditorInput.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ReqifSpecificationEditorInput.java
index 9180aa7..8ed4c3a 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ReqifSpecificationEditorInput.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/ReqifSpecificationEditorInput.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/SetLastChangeCommand.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/SetLastChangeCommand.java
index 524fe39..ea5706b 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/SetLastChangeCommand.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/SetLastChangeCommand.java
@@ -1,3 +1,13 @@
+/*******************************************************************************

+ * Copyright (c) 2014 Formal Mind GmbH, University of Duesseldorf and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     Michael Jastram - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.rmf.reqif10.pror.editor.presentation;

 

 import javax.xml.datatype.XMLGregorianCalendar;

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/SpecificationEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/SpecificationEditor.java
index aff1226..05292e0 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/SpecificationEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/SpecificationEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/TimestampedCommandStack.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/TimestampedCommandStack.java
index c370408..74d7865 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/TimestampedCommandStack.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/TimestampedCommandStack.java
@@ -1,3 +1,13 @@
+/*******************************************************************************

+ * Copyright (c) 2014 Formal Mind GmbH, University of Duesseldorf and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     Michael Jastram - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.rmf.reqif10.pror.editor.presentation;

 

 import org.eclipse.emf.common.command.BasicCommandStack;

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/TimestampedCompoundCommand.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/TimestampedCompoundCommand.java
index 85a9b84..0cb9172 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/TimestampedCompoundCommand.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/TimestampedCompoundCommand.java
@@ -1,3 +1,13 @@
+/*******************************************************************************

+ * Copyright (c) 2014 Formal Mind GmbH, University of Duesseldorf and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     Michael Jastram - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.rmf.reqif10.pror.editor.presentation;

 

 import java.util.ArrayList;

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/AbstractPresentationService.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/AbstractPresentationService.java
index c6e7c0b..d1b81d3 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/AbstractPresentationService.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/AbstractPresentationService.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/IProrCellRenderer.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/IProrCellRenderer.java
index 7d18345..eac336c 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/IProrCellRenderer.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/IProrCellRenderer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/PresentationEditorInterface.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/PresentationEditorInterface.java
index fbcd894..a842020 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/PresentationEditorInterface.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/PresentationEditorInterface.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2012, 2014 Formal Mind GmbH and University of Dusseldorf.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@
 import org.eclipse.rmf.reqif10.SpecElementWithAttributes;
 import org.eclipse.rmf.reqif10.pror.configuration.provider.ProrPresentationConfigurationItemProvider;
 import org.eclipse.rmf.reqif10.pror.util.PresentationEditInterface;
+import org.eclipse.rmf.reqif10.pror.util.ProrUtil;
 
 /**
  * Interface that subclasses of the abstract
@@ -41,7 +42,12 @@
 	/**
 	 * Returns the {@link CellEditor} appropriate for the
 	 * {@link DatatypeDefinition} associated with this configuration. May return
-	 * null (then the default editor is used).
+	 * null (then the default editor is used).<p>
+	 * 
+	 * The cell editor must use EMF commands to set the new value.  That's the reason why the other
+	 * parameters are provided.  Briefly, the easiest is to do the setting via 
+	 * {@link ProrUtil#setTheValue(AttributeValue, Object, Object, Object, EditingDomain)}, which
+	 * allows you to just and the parameters through.<p>
 	 */
 	CellEditor getCellEditor(AgileGrid agileGrid, EditingDomain editingDomain,
 			AttributeValue av, SpecElementWithAttributes parent,
@@ -59,7 +65,8 @@
 	 * has no rich text capabilities.
 	 * <p>
 	 * 
-	 * Note that the user cannot configure a default!
+	 * Note that the user cannot configure a default! Also, for defaults, the
+	 * getLabel() method will not be used either.
 	 * <p>
 	 */
 	Class<? extends DatatypeDefinition> suggestAsDefault();
diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/PresentationServiceManager.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/PresentationServiceManager.java
index d2951b7..9b01274 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/PresentationServiceManager.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/PresentationServiceManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/EDataTypeAgileCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/EDataTypeAgileCellEditor.java
index 720f32a..9cc93d2 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/EDataTypeAgileCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/EDataTypeAgileCellEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ExtendedAgileComboBoxCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ExtendedAgileComboBoxCellEditor.java
index d4747a9..9fb0fdd 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ExtendedAgileComboBoxCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ExtendedAgileComboBoxCellEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ExtendedAgileDialogCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ExtendedAgileDialogCellEditor.java
index d800e65..3365d24 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ExtendedAgileDialogCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ExtendedAgileDialogCellEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyCellEditorProvider.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyCellEditorProvider.java
index 716cbac..18c9560 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyCellEditorProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyCellEditorProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyCellRenderer.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyCellRenderer.java
index 92ad556..3ad62bf 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyCellRenderer.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyCellRenderer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyCellRendererProvider.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyCellRendererProvider.java
index 4ece981..c2d82a0 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyCellRendererProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyCellRendererProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyContentProvider.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyContentProvider.java
index b3c4b95..baf0999 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyContentProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyContentProvider.java
@@ -1,6 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Formal Mind GmbH, University of Duesseldorf and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Michael Jastram - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.reqif10.pror.editor.propertiesview;
 
+import java.text.DateFormat;
 import java.util.ArrayList;
+import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.TreeMap;
 import java.util.TreeSet;
@@ -281,13 +294,26 @@
 					((Descriptor) that).descriptor.getDisplayName(content));
 		}
 
+		/**
+		 * Returns the string content from the descriptor.  However, we have to extract
+		 * the string differently for {@link GregorianCalendar}.
+		 */
 		@Override
 		public String toString() {
 			PropertyValueWrapper propertyValueWrapper = (PropertyValueWrapper) descriptor
 					.getPropertyValue(content);
-			return propertyValueWrapper == null ? "" : propertyValueWrapper
-					.getText(content);
-
+			if (propertyValueWrapper != null) {
+				Object editableValue = propertyValueWrapper.getEditableValue(content);
+				if (editableValue instanceof GregorianCalendar) {
+					GregorianCalendar cal = (GregorianCalendar) editableValue;
+					Date date = cal.getTime();
+					return DateFormat.getDateTimeInstance().format(date);
+				} else {
+					return propertyValueWrapper
+							.getText(content);
+				}
+			}
+			return "";
 		}
 
 		@Override
diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyControl.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyControl.java
index 1102d56..a05a11e 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyControl.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyControl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyLayoutAdvisor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyLayoutAdvisor.java
index 1626d81..c470110 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyLayoutAdvisor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyLayoutAdvisor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertySheetPage.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertySheetPage.java
index 65aaa01..18eecf5 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertySheetPage.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertySheetPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/util/ProrEditorUtil.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/util/ProrEditorUtil.java
index 2a499c3..546eeaa 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/util/ProrEditorUtil.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/util/ProrEditorUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.feature/build.properties b/org.eclipse.rmf.reqif10.pror.feature/build.properties
index 6a2d91e..ec03119 100644
--- a/org.eclipse.rmf.reqif10.pror.feature/build.properties
+++ b/org.eclipse.rmf.reqif10.pror.feature/build.properties
@@ -1,10 +1,12 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     Michael Jastram - initial API and implementation

-bin.includes = feature.xml,\

-               feature.properties

+###############################################################################
+# Copyright (c) 2014 Formal Mind GmbH, University of Duesseldorf and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Michael Jastram - initial API and implementation
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.feature/epl-v10.html b/org.eclipse.rmf.reqif10.pror.feature/epl-v10.html
deleted file mode 100644
index 813c07d..0000000
--- a/org.eclipse.rmf.reqif10.pror.feature/epl-v10.html
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

diff --git a/org.eclipse.rmf.reqif10.pror.feature/feature.properties b/org.eclipse.rmf.reqif10.pror.feature/feature.properties
index 704ede0..8cb6f6c 100644
--- a/org.eclipse.rmf.reqif10.pror.feature/feature.properties
+++ b/org.eclipse.rmf.reqif10.pror.feature/feature.properties
@@ -1,131 +1,32 @@
-# "licenseURL" property - URL of the "Feature License"

-# do not translate value - just change to point to a locale-specific HTML page

-licenseURL=license.html

+###############################################################################

+# Copyright (c) 2014 Formal Mind GmbH, University of Duesseldorf and others.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     Michael Jastram - initial API and implementation

+###############################################################################

+# feature.properties

+# contains externalized strings for feature.xml

+# "%foo" in feature.xml corresponds to the key "foo" in this file

+# java.io.Properties file (ISO 8859-1 with "\\" escapes)

+# This file should be translated.

 

-# "license" property - text of the "Feature Update License"

-# should be plain text version of license agreement pointed to be "licenseURL"

-license=\

-Eclipse Foundation Software User Agreement\n\

-February 1, 2011\n\

-\n\

-Usage Of Content\n\

-\n\

-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\

-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\

-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\

-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\

-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\

-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\

-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\

-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\

-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\

-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\

-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\

-\n\

-Applicable Licenses\n\

-\n\

-Unless otherwise indicated, all Content made available by the\n\

-Eclipse Foundation is provided to you under the terms and conditions of\n\

-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\

-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\

-For purposes of the EPL, "Program" will mean the Content.\n\

-\n\

-Content includes, but is not limited to, source code, object code,\n\

-documentation and other files maintained in the Eclipse Foundation source code\n\

-repository ("Repository") in software modules ("Modules") and made available\n\

-as downloadable archives ("Downloads").\n\

-\n\

-       - Content may be structured and packaged into modules to facilitate delivering,\n\

-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\

-         plug-in fragments ("Fragments"), and features ("Features").\n\

-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\

-         in a directory named "plugins".\n\

-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\

-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\

-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\

-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\

-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\

-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\

-\n\

-The terms and conditions governing Plug-ins and Fragments should be\n\

-contained in files named "about.html" ("Abouts"). The terms and\n\

-conditions governing Features and Included Features should be contained\n\

-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\

-Licenses may be located in any directory of a Download or Module\n\

-including, but not limited to the following locations:\n\

-\n\

-       - The top-level (root) directory\n\

-       - Plug-in and Fragment directories\n\

-       - Inside Plug-ins and Fragments packaged as JARs\n\

-       - Sub-directories of the directory named "src" of certain Plug-ins\n\

-       - Feature directories\n\

-\n\

-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\

-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\

-Update License") during the installation process. If the Feature contains\n\

-Included Features, the Feature Update License should either provide you\n\

-with the terms and conditions governing the Included Features or inform\n\

-you where you can locate them. Feature Update Licenses may be found in\n\

-the "license" property of files named "feature.properties" found within a Feature.\n\

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\

-terms and conditions (or references to such terms and conditions) that\n\

-govern your use of the associated Content in that directory.\n\

-\n\

-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\

-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\

-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\

-\n\

-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\

-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\

-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\

-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\

-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\

-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\

-\n\

-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\

-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\

-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\

-govern that particular Content.\n\

-\n\

-\n\Use of Provisioning Technology\n\

-\n\

-The Eclipse Foundation makes available provisioning software, examples of which include,\n\

-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\

-the purpose of allowing users to install software, documentation, information and/or\n\

-other materials (collectively "Installable Software"). This capability is provided with\n\

-the intent of allowing such users to install, extend and update Eclipse-based products.\n\

-Information about packaging Installable Software is available at\n\

-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\

-\n\

-You may use Provisioning Technology to allow other parties to install Installable Software.\n\

-You shall be responsible for enabling the applicable license agreements relating to the\n\

-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\

-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\

-making it available in accordance with the Specification, you further acknowledge your\n\

-agreement to, and the acquisition of all necessary rights to permit the following:\n\

-\n\

-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\

-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\

-          extending or updating the functionality of an Eclipse-based product.\n\

-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\

-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\

-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\

-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\

-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\

-          with the Specification. Such Installable Software Agreement must inform the user of the\n\

-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\

-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\

-          indication of agreement by the user, the provisioning Technology will complete installation\n\

-          of the Installable Software.\n\

-\n\

-Cryptography\n\

-\n\

-Content may contain encryption software. The country in which you are\n\

-currently may have restrictions on the import, possession, and use,\n\

-and/or re-export to another country, of encryption software. BEFORE\n\

-using any encryption software, please check the country's laws,\n\

-regulations and policies concerning the import, possession, or use, and\n\

-re-export of encryption software, to see if this is permitted.\n\

-\n\

-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n

-########### end of license property ##########################################

+# "featureName" property - name of the feature

+featureName=RMF ProR Feature (Incubation)

+

+# "providerName" property - name of the company that provides the feature

+providerName=Eclipse Modeling Project

+

+# "updateSiteName" property - label for the update site

+

+# "description" property - description of the feature

+description=The ProR GUI for ReqIF 1.0.1.

+

+# "copyright" property - text of the "Feature Update Copyright"

+

+

+

+

diff --git a/org.eclipse.rmf.reqif10.pror.feature/feature.xml b/org.eclipse.rmf.reqif10.pror.feature/feature.xml
index 55e5185..6deae26 100644
--- a/org.eclipse.rmf.reqif10.pror.feature/feature.xml
+++ b/org.eclipse.rmf.reqif10.pror.feature/feature.xml
@@ -1,16 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.rmf.reqif10.pror.feature"

-      label="RMF ProR Feature (Incubation)"

-      version="0.9.0.qualifier"

-      provider-name="Eclipse Modeling Project"

-      plugin="org.eclipse.rmf.reqif10.pror">

-

-   <description url="http://www.example.com/description">

-      The ProR GUI for ReqIF 1.0.1.

-   </description>

-

-   <copyright url="http://www.formalmind.com">

+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.rmf.reqif10.pror.feature"
+      label="%featureName"
+      version="0.10.0.qualifier"
+      provider-name="%providerName"
+      plugin="org.eclipse.rmf.reqif10.pror"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.1.qualifier">
+
+   <description url="http://www.example.com/description">
+      %description
+   </description>
+
+   <copyright url="http://www.formalmind.com">
       Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0
@@ -18,82 +20,82 @@
 http://www.eclipse.org/legal/epl-v10.html
 
 Contributors:
-    Michael Jastram - initial API and implementation

-   </copyright>

-

-   <license url="%licenseURL">

-      %license

-   </license>

-

-   <url>

-      <discovery label="RMF at Eclipse.org" url="http://eclipse.org/rmf"/>

-   </url>

-

-   <requires>

-      <import feature="org.eclipse.rmf.reqif10.feature" version="0.9.0" match="greaterOrEqual"/>

-   </requires>

-

-   <plugin

-         id="org.eclipse.rmf.reqif10.pror"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.rmf.reqif10.pror.edit"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.rmf.reqif10.pror.editor"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.rmf.reqif10.pror.presentation.headline"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.rmf.reqif10.pror.presentation.id"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.rmf.reqif10.pror.presentation.linewrap"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.agilemore.agilegrid"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.rmf.reqif10.pror.help.ui"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="com.google.guava"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-</feature>

+    Michael Jastram - initial API and implementation
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <discovery label="RMF at Eclipse.org" url="http://eclipse.org/rmf"/>
+   </url>
+
+   <requires>
+      <import feature="org.eclipse.rmf.reqif10.feature" version="0.9.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.rmf.reqif10.pror"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rmf.reqif10.pror.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rmf.reqif10.pror.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rmf.reqif10.pror.presentation.headline"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rmf.reqif10.pror.presentation.id"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rmf.reqif10.pror.presentation.linewrap"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.agilemore.agilegrid"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rmf.reqif10.pror.help.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.google.guava"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.rmf.reqif10.pror.feature/license.html b/org.eclipse.rmf.reqif10.pror.feature/license.html
deleted file mode 100644
index 5ef6811..0000000
--- a/org.eclipse.rmf.reqif10.pror.feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

diff --git a/org.eclipse.rmf.reqif10.pror.feature/notice.html b/org.eclipse.rmf.reqif10.pror.feature/notice.html
deleted file mode 100644
index 5ef6811..0000000
--- a/org.eclipse.rmf.reqif10.pror.feature/notice.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

diff --git a/org.eclipse.rmf.reqif10.pror.feature/pom.xml b/org.eclipse.rmf.reqif10.pror.feature/pom.xml
index ed44b2a..169e624 100644
--- a/org.eclipse.rmf.reqif10.pror.feature/pom.xml
+++ b/org.eclipse.rmf.reqif10.pror.feature/pom.xml
@@ -6,11 +6,34 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.reqif10.pror.feature</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<packaging>eclipse-feature</packaging>

 	<groupId>org.eclipse.rmf.features</groupId>

+			<build>

+	<plugins>

+		<plugin>

+				<groupId>org.eclipse.tycho.extras</groupId>

+				<artifactId>tycho-source-feature-plugin</artifactId>

+				<version>${tycho.version}</version>

+				<executions>

+					<execution>

+						<id>source-feature</id>

+						<goals>

+							<goal>source-feature</goal>

+						</goals>

+						<configuration>

+							<excludes>

+								<plugin id="org.agilemore.agilegrid"/>

+								<plugin id="org.eclipse.rmf.reqif10.pror.help.ui"/>

+								<plugin id="com.google.guava"/>

+							</excludes>

+						</configuration>

+					</execution>

+				</executions>

+			</plugin>

+	</plugins>

+	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.genhtml/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.pror.genhtml/META-INF/MANIFEST.MF
index 38c75da..2a7fb99 100644
--- a/org.eclipse.rmf.reqif10.pror.genhtml/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.pror.genhtml/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rmf.reqif10.pror.genhtml
 Bundle-Localization: plugin
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-Activator: org.eclipse.rmf.reqif10.pror.genhtml.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rmf.reqif10;bundle-version="0.9.0",
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html b/org.eclipse.rmf.reqif10.pror.genhtml/about.html
similarity index 99%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
copy to org.eclipse.rmf.reqif10.pror.genhtml/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
+++ b/org.eclipse.rmf.reqif10.pror.genhtml/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.genhtml/build.properties b/org.eclipse.rmf.reqif10.pror.genhtml/build.properties
index f18f627..4e27c6a 100644
--- a/org.eclipse.rmf.reqif10.pror.genhtml/build.properties
+++ b/org.eclipse.rmf.reqif10.pror.genhtml/build.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,9 +7,14 @@
 #

 # Contributors:

 #     Lukas Ladenberger - initial API and implementation

+###############################################################################

+

 source.. = src/

 output.. = bin/

 bin.includes = .,\

                META-INF/,\

-               plugin.properties

+               plugin.properties,\

+               about.html,\

+               epl-v10.html,\

+               notice.html

                
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/epl-v10.html b/org.eclipse.rmf.reqif10.pror.genhtml/epl-v10.html
similarity index 99%
copy from org.eclipse.rmf.examples.feature/epl-v10.html
copy to org.eclipse.rmf.reqif10.pror.genhtml/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.examples.feature/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.pror.genhtml/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/notice.html b/org.eclipse.rmf.reqif10.pror.genhtml/notice.html
similarity index 97%
copy from org.eclipse.rmf.examples.feature/notice.html
copy to org.eclipse.rmf.reqif10.pror.genhtml/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.examples.feature/notice.html
+++ b/org.eclipse.rmf.reqif10.pror.genhtml/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.pror.genhtml/plugin.properties b/org.eclipse.rmf.reqif10.pror.genhtml/plugin.properties
index 7291578..2750e63 100644
--- a/org.eclipse.rmf.reqif10.pror.genhtml/plugin.properties
+++ b/org.eclipse.rmf.reqif10.pror.genhtml/plugin.properties
@@ -1,10 +1,12 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

 # http://www.eclipse.org/legal/epl-v10.html

 #

 # Contributors:

-#     Michael Jastram - initial API and implementation

-pluginName = RMF ProR Editor (Incubation)

+#     Lukas Ladenberger - initial API and implementation

+###############################################################################

+pluginName = RMF ProR HTML Generator (Incubation)

 providerName = Eclipse Modeling Project

diff --git a/org.eclipse.rmf.reqif10.pror.genhtml/pom.xml b/org.eclipse.rmf.reqif10.pror.genhtml/pom.xml
index 3223594..21984f7 100644
--- a/org.eclipse.rmf.reqif10.pror.genhtml/pom.xml
+++ b/org.eclipse.rmf.reqif10.pror.genhtml/pom.xml
@@ -6,12 +6,11 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<groupId>org.eclipse.rmf.plugins</groupId>

 	<artifactId>org.eclipse.rmf.reqif10.pror.genhtml</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

@@ -22,7 +21,7 @@
 			<plugin>

 				<groupId>org.eclipse.tycho</groupId>

 				<artifactId>tycho-surefire-plugin</artifactId>

-				<version>${tycho-version}</version>

+				<version>${tycho.version}</version>

 				<configuration>

 					<includes>

 						<include>**/All*Tests.class</include>

diff --git a/org.eclipse.rmf.reqif10.pror.genhtml/src/org/eclipse/rmf/reqif10/pror/genhtml/Activator.java b/org.eclipse.rmf.reqif10.pror.genhtml/src/org/eclipse/rmf/reqif10/pror/genhtml/Activator.java
index ee6925b..ace4a11 100644
--- a/org.eclipse.rmf.reqif10.pror.genhtml/src/org/eclipse/rmf/reqif10/pror/genhtml/Activator.java
+++ b/org.eclipse.rmf.reqif10.pror.genhtml/src/org/eclipse/rmf/reqif10/pror/genhtml/Activator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

diff --git a/org.eclipse.rmf.reqif10.pror.genhtml/src/org/eclipse/rmf/reqif10/pror/genhtml/GenerateHtml.java b/org.eclipse.rmf.reqif10.pror.genhtml/src/org/eclipse/rmf/reqif10/pror/genhtml/GenerateHtml.java
index 54463c0..4df05c7 100644
--- a/org.eclipse.rmf.reqif10.pror.genhtml/src/org/eclipse/rmf/reqif10/pror/genhtml/GenerateHtml.java
+++ b/org.eclipse.rmf.reqif10.pror.genhtml/src/org/eclipse/rmf/reqif10/pror/genhtml/GenerateHtml.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

diff --git a/org.eclipse.rmf.reqif10.pror.help.ui/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.pror.help.ui/META-INF/MANIFEST.MF
index 8a5fdf1..752a7c6 100644
--- a/org.eclipse.rmf.reqif10.pror.help.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.pror.help.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rmf.reqif10.pror.help.ui;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.help
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.rmf.reqif10.pror.help.ui/about.html b/org.eclipse.rmf.reqif10.pror.help.ui/about.html
index 3f54d02..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.help.ui/about.html
+++ b/org.eclipse.rmf.reqif10.pror.help.ui/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">

-<html>

-<head>

-<title>About</title>

-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

-</head>

-<body lang="EN-US">

-

-<h2>About This Content</h2>

- 

-<p>June 25, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.help.ui/build.properties b/org.eclipse.rmf.reqif10.pror.help.ui/build.properties
index 06a170f..d5e5ead 100644
--- a/org.eclipse.rmf.reqif10.pror.help.ui/build.properties
+++ b/org.eclipse.rmf.reqif10.pror.help.ui/build.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,6 +7,7 @@
 #

 # Contributors:

 #     Lukas Ladenberger - initial API and implementation

+###############################################################################

 bin.includes = META-INF/,\

                .,\

                *.xml/,\

@@ -20,4 +22,6 @@
                RMF/,\

                images/,\

                doc/,\

-               toc.xml

+               toc.xml,\

+               epl-v10.html,\

+               notice.html

diff --git a/org.eclipse.rmf.examples.feature/epl-v10.html b/org.eclipse.rmf.reqif10.pror.help.ui/epl-v10.html
similarity index 99%
copy from org.eclipse.rmf.examples.feature/epl-v10.html
copy to org.eclipse.rmf.reqif10.pror.help.ui/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.examples.feature/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.pror.help.ui/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/notice.html b/org.eclipse.rmf.reqif10.pror.help.ui/notice.html
similarity index 97%
copy from org.eclipse.rmf.examples.feature/notice.html
copy to org.eclipse.rmf.reqif10.pror.help.ui/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.examples.feature/notice.html
+++ b/org.eclipse.rmf.reqif10.pror.help.ui/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.pror.help.ui/plugin.properties b/org.eclipse.rmf.reqif10.pror.help.ui/plugin.properties
index 0822fb5..648bcab 100644
--- a/org.eclipse.rmf.reqif10.pror.help.ui/plugin.properties
+++ b/org.eclipse.rmf.reqif10.pror.help.ui/plugin.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,5 +7,6 @@
 #

 # Contributors:

 #     Lukas Ladenberger - initial API and implementation

+###############################################################################

 pluginName = RMF ProR Help (Incubation)

 providerName = Eclipse Modeling Project

diff --git a/org.eclipse.rmf.reqif10.pror.help.ui/pom.xml b/org.eclipse.rmf.reqif10.pror.help.ui/pom.xml
index 2f894ac..9c573b6 100644
--- a/org.eclipse.rmf.reqif10.pror.help.ui/pom.xml
+++ b/org.eclipse.rmf.reqif10.pror.help.ui/pom.xml
@@ -6,11 +6,10 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.reqif10.pror.help.ui</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

 	<groupId>org.eclipse.rmf.plugins</groupId>

 	<properties>

@@ -34,19 +33,6 @@
                  </execution>

                </executions>

             </plugin>

-			<plugin>

-				<groupId>org.eclipse.tycho</groupId>

-				<artifactId>tycho-source-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<executions>

-					<execution>

-						<id>plugin-source</id>

-						<goals>

-							<goal>plugin-source</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

 		</plugins>

 	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/LICENSE.html b/org.eclipse.rmf.reqif10.pror.presentation.headline/LICENSE.html
deleted file mode 100644
index 2eb14eb..0000000
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/LICENSE.html
+++ /dev/null
@@ -1,224 +0,0 @@
-

-    Eclipse Public License - v 1.0

-

-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF

-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.

-

-*1. DEFINITIONS*

-

-"Contribution" means:

-

-a) in the case of the initial Contributor, the initial code and

-documentation distributed under this Agreement, and

-

-b) in the case of each subsequent Contributor:

-

-i) changes to the Program, and

-

-ii) additions to the Program;

-

-where such changes and/or additions to the Program originate from and

-are distributed by that particular Contributor. A Contribution

-'originates' from a Contributor if it was added to the Program by such

-Contributor itself or anyone acting on such Contributor's behalf.

-Contributions do not include additions to the Program which: (i) are

-separate modules of software distributed in conjunction with the Program

-under their own license agreement, and (ii) are not derivative works of

-the Program.

-

-"Contributor" means any person or entity that distributes the Program.

-

-"Licensed Patents" mean patent claims licensable by a Contributor which

-are necessarily infringed by the use or sale of its Contribution alone

-or when combined with the Program.

-

-"Program" means the Contributions distributed in accordance with this

-Agreement.

-

-"Recipient" means anyone who receives the Program under this Agreement,

-including all Contributors.

-

-*2. GRANT OF RIGHTS*

-

-a) Subject to the terms of this Agreement, each Contributor hereby

-grants Recipient a non-exclusive, worldwide, royalty-free copyright

-license to reproduce, prepare derivative works of, publicly display,

-publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and

-object code form.

-

-b) Subject to the terms of this Agreement, each Contributor hereby

-grants Recipient a non-exclusive, worldwide, royalty-free patent license

-under Licensed Patents to make, use, sell, offer to sell, import and

-otherwise transfer the Contribution of such Contributor, if any, in

-source code and object code form. This patent license shall apply to the

-combination of the Contribution and the Program if, at the time the

-Contribution is added by the Contributor, such addition of the

-Contribution causes such combination to be covered by the Licensed

-Patents. The patent license shall not apply to any other combinations

-which include the Contribution. No hardware per se is licensed hereunder.

-

-c) Recipient understands that although each Contributor grants the

-licenses to its Contributions set forth herein, no assurances are

-provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.

-

-d) Each Contributor represents that to its knowledge it has sufficient

-copyright rights in its Contribution, if any, to grant the copyright

-license set forth in this Agreement.

-

-*3. REQUIREMENTS*

-

-A Contributor may choose to distribute the Program in object code form

-under its own license agreement, provided that:

-

-a) it complies with the terms and conditions of this Agreement; and

-

-b) its license agreement:

-

-i) effectively disclaims on behalf of all Contributors all warranties

-and conditions, express and implied, including warranties or conditions

-of title and non-infringement, and implied warranties or conditions of

-merchantability and fitness for a particular purpose;

-

-ii) effectively excludes on behalf of all Contributors all liability for

-damages, including direct, indirect, special, incidental and

-consequential damages, such as lost profits;

-

-iii) states that any provisions which differ from this Agreement are

-offered by that Contributor alone and not by any other party; and

-

-iv) states that source code for the Program is available from such

-Contributor, and informs licensees how to obtain it in a reasonable

-manner on or through a medium customarily used for software exchange.

-

-When the Program is made available in source code form:

-

-a) it must be made available under this Agreement; and

-

-b) a copy of this Agreement must be included with each copy of the Program.

-

-Contributors may not remove or alter any copyright notices contained

-within the Program.

-

-Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.

-

-*4. COMMERCIAL DISTRIBUTION*

-

-Commercial distributors of software may accept certain responsibilities

-with respect to end users, business partners and the like. While this

-license is intended to facilitate the commercial use of the Program, the

-Contributor who includes the Program in a commercial product offering

-should do so in a manner which does not create potential liability for

-other Contributors. Therefore, if a Contributor includes the Program in

-a commercial product offering, such Contributor ("Commercial

-Contributor") hereby agrees to defend and indemnify every other

-Contributor ("Indemnified Contributor") against any losses, damages and

-costs (collectively "Losses") arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified

-Contributor to the extent caused by the acts or omissions of such

-Commercial Contributor in connection with its distribution of the

-Program in a commercial product offering. The obligations in this

-section do not apply to any claims or Losses relating to any actual or

-alleged intellectual property infringement. In order to qualify, an

-Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial

-Contributor to control, and cooperate with the Commercial Contributor

-in, the defense and any related settlement negotiations. The Indemnified

-Contributor may participate in any such claim at its own expense.

-

-For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.

-

-*5. NO WARRANTY*

-

-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED

-ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,

-EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES

-OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR

-A PARTICULAR PURPOSE. Each Recipient is solely responsible for

-determining the appropriateness of using and distributing the Program

-and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program

-errors, compliance with applicable laws, damage to or loss of data,

-programs or equipment, and unavailability or interruption of operations.

-

-*6. DISCLAIMER OF LIABILITY*

-

-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR

-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

-

-*7. GENERAL*

-

-If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.

-

-If Recipient institutes patent litigation against any entity (including

-a cross-claim or counterclaim in a lawsuit) alleging that the Program

-itself (excluding combinations of the Program with other software or

-hardware) infringes such Recipient's patent(s), then such Recipient's

-rights granted under Section 2(b) shall terminate as of the date such

-litigation is filed.

-

-All Recipient's rights under this Agreement shall terminate if it fails

-to comply with any of the material terms or conditions of this Agreement

-and does not cure such failure in a reasonable period of time after

-becoming aware of such noncompliance. If all Recipient's rights under

-this Agreement terminate, Recipient agrees to cease use and distribution

-of the Program as soon as reasonably practicable. However, Recipient's

-obligations under this Agreement and any licenses granted by Recipient

-relating to the Program shall continue and survive.

-

-Everyone is permitted to copy and distribute copies of this Agreement,

-but in order to avoid inconsistency the Agreement is copyrighted and may

-only be modified in the following manner. The Agreement Steward reserves

-the right to publish new versions (including revisions) of this

-Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the

-initial Agreement Steward. The Eclipse Foundation may assign the

-responsibility to serve as the Agreement Steward to a suitable separate

-entity. Each new version of the Agreement will be given a distinguishing

-version number. The Program (including Contributions) may always be

-distributed subject to the version of the Agreement under which it was

-received. In addition, after a new version of the Agreement is

-published, Contributor may elect to distribute the Program (including

-its Contributions) under the new version. Except as expressly stated in

-Sections 2(a) and 2(b) above, Recipient receives no rights or licenses

-to the intellectual property of any Contributor under this Agreement,

-whether expressly, by implication, estoppel or otherwise. All rights in

-the Program not expressly granted under this Agreement are reserved.

-

-This Agreement is governed by the laws of the State of New York and the

-intellectual property laws of the United States of America. No party to

-this Agreement will bring a legal action under this Agreement more than

-one year after the cause of action arose. Each party waives its rights

-to a jury trial in any resulting litigation.

-

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.pror.presentation.headline/META-INF/MANIFEST.MF
index d9c19bb..36f4339 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/META-INF/MANIFEST.MF
@@ -2,17 +2,16 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.reqif10.pror.presentation.headline;singleton:=true

-Bundle-Version: 0.9.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Bundle-ClassPath: .

 Bundle-Activator: org.eclipse.rmf.reqif10.pror.presentation.headline.provider.HeadlineEditPlugin$Implementation

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

-Export-Package: 

- org.eclipse.rmf.reqif10.pror.presentation.headline,

- org.eclipse.rmf.reqif10.pror.presentation.headline.impl,

- org.eclipse.rmf.reqif10.pror.presentation.headline.provider,

- org.eclipse.rmf.reqif10.pror.presentation.headline.ui,

- org.eclipse.rmf.reqif10.pror.presentation.headline.util

+Export-Package: org.eclipse.rmf.reqif10.pror.presentation.headline,org

+ .eclipse.rmf.reqif10.pror.presentation.headline.impl,org.eclipse.rmf.

+ reqif10.pror.presentation.headline.provider,org.eclipse.rmf.reqif10.p

+ ror.presentation.headline.ui,org.eclipse.rmf.reqif10.pror.presentatio

+ n.headline.util

 Require-Bundle: org.eclipse.rmf.reqif10.pror.editor;bundle-version="0.9.0"

 Bundle-ActivationPolicy: lazy

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/about.html b/org.eclipse.rmf.reqif10.pror.presentation.headline/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/about.html
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/build.properties b/org.eclipse.rmf.reqif10.pror.presentation.headline/build.properties
index 1e86dd8..5d2c80f 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/build.properties
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/build.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,10 +7,15 @@
 #

 # Contributors:

 #     Michael Jastram - initial API and implementation

+###############################################################################

+

 bin.includes = .,\

                META-INF/,\

                plugin.xml,\

-               plugin.properties

+               plugin.properties,\

+               notice.html,\

+               epl-v10.html,\

+               about.html

 jars.compile.order = .

 source.. = src/

 output.. = bin/

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/epl-v10.html b/org.eclipse.rmf.reqif10.pror.presentation.headline/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/notice.html b/org.eclipse.rmf.reqif10.pror.presentation.headline/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/notice.html
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/plugin.properties b/org.eclipse.rmf.reqif10.pror.presentation.headline/plugin.properties
index 979cf72..75872f5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/plugin.properties
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/plugin.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,6 +7,8 @@
 #

 # Contributors:

 #     Michael Jastram - initial API and implementation

+###############################################################################

+

 pluginName = RMF ProR Headline Presentation (Incubation)

 providerName = Eclipse Modeling Project

 

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/pom.xml b/org.eclipse.rmf.reqif10.pror.presentation.headline/pom.xml
index 6178a46..0bd9999 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/pom.xml
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/pom.xml
@@ -6,31 +6,13 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.reqif10.pror.presentation.headline</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

 	<groupId>org.eclipse.rmf.plugins</groupId>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

- 	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.eclipse.tycho</groupId>

-				<artifactId>tycho-source-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<executions>

-					<execution>

-						<id>plugin-source</id>

-						<goals>

-							<goal>plugin-source</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlineConfiguration.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlineConfiguration.java
index 9dc3bd3..1fc83c3 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlineConfiguration.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlineConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlineFactory.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlineFactory.java
index 829206d..f469187 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlineFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlineFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlinePackage.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlinePackage.java
index 8115a5c..7f5753a 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlinePackage.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlinePackage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlineConfigurationImpl.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlineConfigurationImpl.java
index af02c55..f665324 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlineConfigurationImpl.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlineConfigurationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlineFactoryImpl.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlineFactoryImpl.java
index 73e875c..60e25df 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlineFactoryImpl.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlineFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlinePackageImpl.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlinePackageImpl.java
index ff0f66c..58b0e27 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlinePackageImpl.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlinePackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineConfigurationItemProvider.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineConfigurationItemProvider.java
index 90aabf7..812fd0c 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineConfigurationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineConfigurationItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineEditPlugin.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineEditPlugin.java
index 86c2388..4eb327d 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineEditPlugin.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineEditPlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineItemProviderAdapterFactory.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineItemProviderAdapterFactory.java
index 96b7421..6af917a 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineItemProviderAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineItemProviderAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/ui/HeadlineCellRenderer.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/ui/HeadlineCellRenderer.java
index 12aecb7..41ca8e9 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/ui/HeadlineCellRenderer.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/ui/HeadlineCellRenderer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/ui/HeadlinePresentationService.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/ui/HeadlinePresentationService.java
index a459a38..55abaf6 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/ui/HeadlinePresentationService.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/ui/HeadlinePresentationService.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/util/HeadlineAdapterFactory.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/util/HeadlineAdapterFactory.java
index 8ea4d33..23e8a93 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/util/HeadlineAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/util/HeadlineAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/util/HeadlineSwitch.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/util/HeadlineSwitch.java
index 61d69a3..a38196b 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/util/HeadlineSwitch.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/util/HeadlineSwitch.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/validation/HeadlineConfigurationValidator.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/validation/HeadlineConfigurationValidator.java
index c9add3f..9a53a5c 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/validation/HeadlineConfigurationValidator.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/validation/HeadlineConfigurationValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b366e86..0000000
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Tue Apr 10 10:40:32 CEST 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.pror.presentation.id.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 7448fde..0000000
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.rmf.reqif10.pror.presentation.id.tests

-Bundle-Version: 0.9.0.qualifier

-Bundle-Localization: plugin

-Fragment-Host: org.eclipse.rmf.reqif10.pror.presentation.id

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Bundle-Vendor: %providerName

-Require-Bundle: org.eclipse.rmf.reqif10.pror.tests;bundle-version="0.9.0",

- org.junit;bundle-version="4.8.2"

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/build.properties b/org.eclipse.rmf.reqif10.pror.presentation.id.tests/build.properties
deleted file mode 100644
index 41eb6ad..0000000
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/epl-v10.html b/org.eclipse.rmf.reqif10.pror.presentation.id.tests/epl-v10.html
deleted file mode 100644
index 813c07d..0000000
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/epl-v10.html
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/notice.html b/org.eclipse.rmf.reqif10.pror.presentation.id.tests/notice.html
deleted file mode 100644
index 5ef6811..0000000
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/notice.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/plugin.properties b/org.eclipse.rmf.reqif10.pror.presentation.id.tests/plugin.properties
deleted file mode 100644
index 9a0ca1e..0000000
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/plugin.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     Michael Jastram - initial API and implementation

-pluginName = RMF ProR ID Presentation Tests (Incubation)

-providerName = Eclipse Modeling Project

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/src/org/eclipse/rmf/reqif10/pror/presentation/id/tests/AllIDPresentationTests.java b/org.eclipse.rmf.reqif10.pror.presentation.id.tests/src/org/eclipse/rmf/reqif10/pror/presentation/id/tests/AllIDPresentationTests.java
deleted file mode 100644
index ed0323f..0000000
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/src/org/eclipse/rmf/reqif10/pror/presentation/id/tests/AllIDPresentationTests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2012 itemis AG.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Mark Broerkens - initial API and implementation

- ******************************************************************************/

-package org.eclipse.rmf.reqif10.pror.presentation.id.tests;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-

-

-@RunWith(Suite.class)

-@SuiteClasses({ IdConfigurationTest.class })

-public class AllIDPresentationTests {

-	

-

-

-}

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/src/org/eclipse/rmf/reqif10/pror/presentation/id/tests/IdConfigurationTest.java b/org.eclipse.rmf.reqif10.pror.presentation.id.tests/src/org/eclipse/rmf/reqif10/pror/presentation/id/tests/IdConfigurationTest.java
deleted file mode 100644
index 1714ae5..0000000
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/src/org/eclipse/rmf/reqif10/pror/presentation/id/tests/IdConfigurationTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2012 Formal Mind GmbH and University of Dusseldorf.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Michael Jastram - initial API and implementation

- ******************************************************************************/

-

-package org.eclipse.rmf.reqif10.pror.presentation.id.tests;

-

-import org.eclipse.rmf.reqif10.configuration.tests.ProrPresentationConfigurationTest;

-import org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration;

-import org.eclipse.rmf.reqif10.pror.presentation.id.IdFactory;

-import org.junit.After;

-import org.junit.Before;

-

-/**

- * A test case for the model object '<em><b>Id Configuration</b></em>'.

- */

-public class IdConfigurationTest extends ProrPresentationConfigurationTest {

-

-	/**

-	 * Sets the fixture for this Configuration test case.

-	 */

-	protected void setFixture(IdConfiguration fixture) {

-		this.fixture = fixture;

-	}

-

-	/**

-	 * Returns the fixture for this Configuration test case.

-	 */

-	protected IdConfiguration getFixture() {

-		return (IdConfiguration) fixture;

-	}

-

-	/**

-	 * @see junit.framework.TestCase#setUp()

-	 */

-	@Before

-	public void setUp() throws Exception {

-		setFixture(IdFactory.eINSTANCE.createIdConfiguration());

-	}

-

-	/**

-	 * @see junit.framework.TestCase#tearDown()

-	 */

-	@After

-	public void tearDown() throws Exception {

-		setFixture(null);

-	}

-

-} //IdConfigurationTest

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.pror.presentation.id/META-INF/MANIFEST.MF
index 66e3419..f2ff7ea 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/META-INF/MANIFEST.MF
@@ -2,16 +2,15 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.reqif10.pror.presentation.id;singleton:=true

-Bundle-Version: 0.9.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Bundle-ClassPath: .

 Bundle-Activator: org.eclipse.rmf.reqif10.pror.presentation.id.provider.IDEditPlugin$Implementation

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Export-Package: org.eclipse.rmf.reqif10.pror.presentation.id,

- org.eclipse.rmf.reqif10.pror.presentation.id.impl,

- org.eclipse.rmf.reqif10.pror.presentation.id.provider,

- org.eclipse.rmf.reqif10.pror.presentation.id.util,

- org.eclipse.rmf.reqif10.pror.presentation.ui

+Export-Package: org.eclipse.rmf.reqif10.pror.presentation.id,org.eclip

+ se.rmf.reqif10.pror.presentation.id.impl,org.eclipse.rmf.reqif10.pror

+ .presentation.id.provider,org.eclipse.rmf.reqif10.pror.presentation.i

+ d.util,org.eclipse.rmf.reqif10.pror.presentation.ui

 Require-Bundle: org.eclipse.rmf.reqif10.pror.editor;bundle-version="0.9.0"

 Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/about.html b/org.eclipse.rmf.reqif10.pror.presentation.id/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/about.html
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/build.properties b/org.eclipse.rmf.reqif10.pror.presentation.id/build.properties
index 774a84d..46b38ea 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/build.properties
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/build.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,11 +7,16 @@
 #

 # Contributors:

 #     Michael Jastram - initial API and implementation

+###############################################################################

+

 bin.includes = .,\

                icons/,\

                META-INF/,\

                plugin.xml,\

-               plugin.properties

+               plugin.properties,\

+               about.html,\

+               notice.html,\

+               epl-v10.html

 jars.compile.order = .

 source.. = src/

 output.. = bin/

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/epl-v10.html b/org.eclipse.rmf.reqif10.pror.presentation.id/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/notice.html b/org.eclipse.rmf.reqif10.pror.presentation.id/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/notice.html
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/plugin.properties b/org.eclipse.rmf.reqif10.pror.presentation.id/plugin.properties
index 120a147..d608fe6 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/plugin.properties
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/plugin.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,6 +7,8 @@
 #

 # Contributors:

 #     Michael Jastram - initial API and implementation

+###############################################################################

+

 pluginName = RMF ProR ID Presentation (Incubation)

 providerName = Eclipse Modeling Project

 _UI_CreateChild_text = {0}

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/pom.xml b/org.eclipse.rmf.reqif10.pror.presentation.id/pom.xml
index cf6b8a3..8ea88f7 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/pom.xml
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/pom.xml
@@ -6,31 +6,13 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.reqif10.pror.presentation.id</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

 	<groupId>org.eclipse.rmf.plugins</groupId>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

- 	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.eclipse.tycho</groupId>

-				<artifactId>tycho-source-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<executions>

-					<execution>

-						<id>plugin-source</id>

-						<goals>

-							<goal>plugin-source</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/IdConfiguration.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/IdConfiguration.java
index 3354bde..aaabbc5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/IdConfiguration.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/IdConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/IdFactory.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/IdFactory.java
index 5e96fa7..a651700 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/IdFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/IdFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/impl/IdConfigurationImpl.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/impl/IdConfigurationImpl.java
index 4a2b8cf..4250691 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/impl/IdConfigurationImpl.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/impl/IdConfigurationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/impl/IdPackageImpl.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/impl/IdPackageImpl.java
index 8078331..0a325fb 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/impl/IdPackageImpl.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/impl/IdPackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IDEditPlugin.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IDEditPlugin.java
index 964f452..10dcf15 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IDEditPlugin.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IDEditPlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IdConfigurationItemProvider.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IdConfigurationItemProvider.java
index 826e26b..7c817c2 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IdConfigurationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IdConfigurationItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IdItemProviderAdapterFactory.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IdItemProviderAdapterFactory.java
index e2d3bdf..55b5a71 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IdItemProviderAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IdItemProviderAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/util/IdAdapterFactory.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/util/IdAdapterFactory.java
index 9a7bcc0..b120614 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/util/IdAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/util/IdAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/util/IdSwitch.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/util/IdSwitch.java
index 2ce4892..2387370 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/util/IdSwitch.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/util/IdSwitch.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/validation/IdConfigurationValidator.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/validation/IdConfigurationValidator.java
index 56725cd..bca9dd4 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/validation/IdConfigurationValidator.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/validation/IdConfigurationValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/META-INF/MANIFEST.MF
index 7460f52..c9137d8 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.reqif10.pror.presentation.linewrap;singleton:=true

-Bundle-Version: 0.9.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Bundle-ClassPath: .

 Bundle-Activator: org.eclipse.rmf.reqif10.pror.presentation.linewrap.provider.LinewrapEditPlugin$Implementation

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Export-Package: org.eclipse.rmf.reqif10.pror.presentation.linewrap,

- org.eclipse.rmf.reqif10.pror.presentation.linewrap.impl,

- org.eclipse.rmf.reqif10.pror.presentation.linewrap.provider,

- org.eclipse.rmf.reqif10.pror.presentation.linewrap.util,

- org.eclipse.rmf.reqif10.pror.presentation.ui

+Export-Package: org.eclipse.rmf.reqif10.pror.presentation.linewrap,org

+ .eclipse.rmf.reqif10.pror.presentation.linewrap.impl,org.eclipse.rmf.

+ reqif10.pror.presentation.linewrap.provider,org.eclipse.rmf.reqif10.p

+ ror.presentation.linewrap.util,org.eclipse.rmf.reqif10.pror.presentat

+ ion.ui

 Require-Bundle: org.eclipse.rmf.reqif10.pror.editor;bundle-version="0.9.0"

 Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/about.html b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/about.html
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/build.properties b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/build.properties
index 774a84d..f2bdc24 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/build.properties
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/build.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,11 +7,16 @@
 #

 # Contributors:

 #     Michael Jastram - initial API and implementation

+###############################################################################

+

 bin.includes = .,\

                icons/,\

                META-INF/,\

                plugin.xml,\

-               plugin.properties

+               plugin.properties,\

+               about.html,\

+               epl-v10.html,\

+               notice.html

 jars.compile.order = .

 source.. = src/

 output.. = bin/

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/epl-v10.html b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/notice.html b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/notice.html
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/plugin.properties b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/plugin.properties
index 663eedd..d9372b8 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/plugin.properties
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/plugin.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,6 +7,8 @@
 #

 # Contributors:

 #     Michael Jastram - initial API and implementation

+###############################################################################

+

 pluginName = RMF ProR Linewrap Presentation (Incubation)

 providerName = Eclipse Modeling Project

 _UI_CreateChild_text = {0}

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/pom.xml b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/pom.xml
index 580ebeb..f1409cf 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/pom.xml
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/pom.xml
@@ -6,11 +6,10 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.reqif10.pror.presentation.linewrap</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

 	<groupId>org.eclipse.rmf.plugins</groupId>

 	<properties>

@@ -21,7 +20,7 @@
 			<plugin>

 				<groupId>org.eclipse.tycho</groupId>

 				<artifactId>tycho-source-plugin</artifactId>

-				<version>${tycho-version}</version>

+				<version>${tycho.version}</version>

 				<executions>

 					<execution>

 						<id>plugin-source</id>

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/LinewrapEditPlugin.java b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/LinewrapEditPlugin.java
index a341469..aa71dbe 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/LinewrapEditPlugin.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/LinewrapEditPlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/LinewrapConfiguration.java b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/LinewrapConfiguration.java
index 96a40d0..5d4b1eb 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/LinewrapConfiguration.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/LinewrapConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/LinewrapFactory.java b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/LinewrapFactory.java
index af652e3..376178c 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/LinewrapFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/LinewrapFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/LinewrapPackage.java b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/LinewrapPackage.java
index 3198461..1648233 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/LinewrapPackage.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/LinewrapPackage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/impl/LinewrapConfigurationImpl.java b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/impl/LinewrapConfigurationImpl.java
index 0de0b8e..689855a 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/impl/LinewrapConfigurationImpl.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/impl/LinewrapConfigurationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/impl/LinewrapFactoryImpl.java b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/impl/LinewrapFactoryImpl.java
index c4e05ba..7638e46 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/impl/LinewrapFactoryImpl.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/impl/LinewrapFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/impl/LinewrapPackageImpl.java b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/impl/LinewrapPackageImpl.java
index 40c4a57..a8bc3ec 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/impl/LinewrapPackageImpl.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/impl/LinewrapPackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/provider/LinewrapConfigurationItemProvider.java b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/provider/LinewrapConfigurationItemProvider.java
index 0a49e7a..e7da2d6 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/provider/LinewrapConfigurationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/provider/LinewrapConfigurationItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2014 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -34,7 +34,6 @@
 import org.eclipse.rmf.reqif10.DatatypeDefinitionString;

 import org.eclipse.rmf.reqif10.SpecElementWithAttributes;

 import org.eclipse.rmf.reqif10.common.util.ReqIF10Util;

-import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;

 import org.eclipse.rmf.reqif10.pror.configuration.provider.ProrPresentationConfigurationItemProvider;

 import org.eclipse.rmf.reqif10.pror.editor.presentation.service.IProrCellRenderer;

 import org.eclipse.rmf.reqif10.pror.editor.presentation.service.PresentationEditorInterface;

@@ -46,13 +45,17 @@
 /**

  * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.pror.presentation.linewrap.LinewrapConfiguration} object.

  * <!-- begin-user-doc -->

+ * Modified to implement {@link PresentationEditorInterface}

  * <!-- end-user-doc -->

- * @generated

+ * @generated NOT

  */

 public class LinewrapConfigurationItemProvider

 	extends ProrPresentationConfigurationItemProvider

 	implements

-		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

+		IEditingDomainItemProvider, IStructuredItemContentProvider, 

+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,

+		PresentationEditorInterface {

+	

 	/**

 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

@@ -144,19 +147,8 @@
 		return LinewrapEditPlugin.INSTANCE;

 	}

 

-	public void registerPresentationConfiguration(ProrPresentationConfiguration config,

-			EditingDomain editingDomain) {

-		// No action required.

-

-	}

-

-	public void unregisterPresentationConfiguration(ProrPresentationConfiguration config) {

-		// No action required.

-	}

-

 	private LinewrapCellRenderer linewrapCellRenderer;

 

-

 	public IProrCellRenderer getCellRenderer(AttributeValue av) {

 		if (linewrapCellRenderer == null) {

 			linewrapCellRenderer = new LinewrapCellRenderer();

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/provider/LinewrapEditPlugin.java b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/provider/LinewrapEditPlugin.java
index d46964b..2f75ff8 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/provider/LinewrapEditPlugin.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/provider/LinewrapEditPlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/provider/LinewrapItemProviderAdapterFactory.java b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/provider/LinewrapItemProviderAdapterFactory.java
index bf05ba9..3d87b62 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/provider/LinewrapItemProviderAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/provider/LinewrapItemProviderAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/util/LinewrapAdapterFactory.java b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/util/LinewrapAdapterFactory.java
index fccad15..4f9a694 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/util/LinewrapAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/util/LinewrapAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/util/LinewrapSwitch.java b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/util/LinewrapSwitch.java
index 968d302..a606386 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/util/LinewrapSwitch.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/util/LinewrapSwitch.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/validation/LinewrapConfigurationValidator.java b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/validation/LinewrapConfigurationValidator.java
index 2eb417f..16c9fc4 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/validation/LinewrapConfigurationValidator.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/linewrap/validation/LinewrapConfigurationValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/ui/LinewrapCellEditor.java b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/ui/LinewrapCellEditor.java
index 8ae604e..e172b27 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/ui/LinewrapCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/ui/LinewrapCellEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/ui/LinewrapCellRenderer.java b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/ui/LinewrapCellRenderer.java
index b73ced6..5a8834e 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/ui/LinewrapCellRenderer.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/ui/LinewrapCellRenderer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/ui/LinewrapPresentationService.java b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/ui/LinewrapPresentationService.java
index 4ee724e..89ddc75 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/ui/LinewrapPresentationService.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.linewrap/src/org/eclipse/rmf/reqif10/pror/presentation/ui/LinewrapPresentationService.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.sdk.feature/about.ini b/org.eclipse.rmf.reqif10.pror.sdk.feature/about.ini
deleted file mode 100644
index b8467b3..0000000
--- a/org.eclipse.rmf.reqif10.pror.sdk.feature/about.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-featureImage=icons/full/prorIcon/prorIcon32.png

-appName=ProR Requirements Engineering Platform

-aboutText=%blurb

diff --git a/org.eclipse.rmf.reqif10.pror.sdk.feature/about.properties b/org.eclipse.rmf.reqif10.pror.sdk.feature/about.properties
deleted file mode 100644
index 56ac003..0000000
--- a/org.eclipse.rmf.reqif10.pror.sdk.feature/about.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-blurb=Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.\n\

-All rights reserved. This program and the accompanying materials\n\

-are made available under the terms of the Eclipse Public License v1.0\n\

-which accompanies this distribution, and is available at\n\

-http://www.eclipse.org/legal/epl-v10.html\n\

-\n\

-Contributors:\n\

-    Michael Jastram - initial API and implementation\n\

-    
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.sdk.feature/build.properties b/org.eclipse.rmf.reqif10.pror.sdk.feature/build.properties
index cdef97b..ec03119 100644
--- a/org.eclipse.rmf.reqif10.pror.sdk.feature/build.properties
+++ b/org.eclipse.rmf.reqif10.pror.sdk.feature/build.properties
@@ -1,15 +1,12 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     Michael Jastram - initial API and implementation

-bin.includes = feature.xml,\

-               feature.properties,\

-               epl-v10.html,\

-               about.properties,\

-               about.ini,\

-               license.html,\

-               notice.html

+###############################################################################
+# Copyright (c) 2014 Formal Mind GmbH, University of Duesseldorf and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Michael Jastram - initial API and implementation
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.sdk.feature/epl-v10.html b/org.eclipse.rmf.reqif10.pror.sdk.feature/epl-v10.html
deleted file mode 100644
index 813c07d..0000000
--- a/org.eclipse.rmf.reqif10.pror.sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

diff --git a/org.eclipse.rmf.reqif10.pror.sdk.feature/feature.properties b/org.eclipse.rmf.reqif10.pror.sdk.feature/feature.properties
index 704ede0..1855bdc 100644
--- a/org.eclipse.rmf.reqif10.pror.sdk.feature/feature.properties
+++ b/org.eclipse.rmf.reqif10.pror.sdk.feature/feature.properties
@@ -1,131 +1,32 @@
-# "licenseURL" property - URL of the "Feature License"

-# do not translate value - just change to point to a locale-specific HTML page

-licenseURL=license.html

+###############################################################################

+# Copyright (c) 2014 Formal Mind GmbH, University of Duesseldorf and others.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     Michael Jastram - initial API and implementation

+###############################################################################

+# feature.properties

+# contains externalized strings for feature.xml

+# "%foo" in feature.xml corresponds to the key "foo" in this file

+# java.io.Properties file (ISO 8859-1 with "\\" escapes)

+# This file should be translated.

 

-# "license" property - text of the "Feature Update License"

-# should be plain text version of license agreement pointed to be "licenseURL"

-license=\

-Eclipse Foundation Software User Agreement\n\

-February 1, 2011\n\

-\n\

-Usage Of Content\n\

-\n\

-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\

-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\

-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\

-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\

-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\

-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\

-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\

-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\

-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\

-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\

-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\

-\n\

-Applicable Licenses\n\

-\n\

-Unless otherwise indicated, all Content made available by the\n\

-Eclipse Foundation is provided to you under the terms and conditions of\n\

-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\

-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\

-For purposes of the EPL, "Program" will mean the Content.\n\

-\n\

-Content includes, but is not limited to, source code, object code,\n\

-documentation and other files maintained in the Eclipse Foundation source code\n\

-repository ("Repository") in software modules ("Modules") and made available\n\

-as downloadable archives ("Downloads").\n\

-\n\

-       - Content may be structured and packaged into modules to facilitate delivering,\n\

-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\

-         plug-in fragments ("Fragments"), and features ("Features").\n\

-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\

-         in a directory named "plugins".\n\

-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\

-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\

-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\

-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\

-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\

-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\

-\n\

-The terms and conditions governing Plug-ins and Fragments should be\n\

-contained in files named "about.html" ("Abouts"). The terms and\n\

-conditions governing Features and Included Features should be contained\n\

-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\

-Licenses may be located in any directory of a Download or Module\n\

-including, but not limited to the following locations:\n\

-\n\

-       - The top-level (root) directory\n\

-       - Plug-in and Fragment directories\n\

-       - Inside Plug-ins and Fragments packaged as JARs\n\

-       - Sub-directories of the directory named "src" of certain Plug-ins\n\

-       - Feature directories\n\

-\n\

-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\

-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\

-Update License") during the installation process. If the Feature contains\n\

-Included Features, the Feature Update License should either provide you\n\

-with the terms and conditions governing the Included Features or inform\n\

-you where you can locate them. Feature Update Licenses may be found in\n\

-the "license" property of files named "feature.properties" found within a Feature.\n\

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\

-terms and conditions (or references to such terms and conditions) that\n\

-govern your use of the associated Content in that directory.\n\

-\n\

-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\

-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\

-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\

-\n\

-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\

-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\

-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\

-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\

-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\

-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\

-\n\

-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\

-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\

-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\

-govern that particular Content.\n\

-\n\

-\n\Use of Provisioning Technology\n\

-\n\

-The Eclipse Foundation makes available provisioning software, examples of which include,\n\

-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\

-the purpose of allowing users to install software, documentation, information and/or\n\

-other materials (collectively "Installable Software"). This capability is provided with\n\

-the intent of allowing such users to install, extend and update Eclipse-based products.\n\

-Information about packaging Installable Software is available at\n\

-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\

-\n\

-You may use Provisioning Technology to allow other parties to install Installable Software.\n\

-You shall be responsible for enabling the applicable license agreements relating to the\n\

-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\

-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\

-making it available in accordance with the Specification, you further acknowledge your\n\

-agreement to, and the acquisition of all necessary rights to permit the following:\n\

-\n\

-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\

-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\

-          extending or updating the functionality of an Eclipse-based product.\n\

-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\

-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\

-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\

-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\

-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\

-          with the Specification. Such Installable Software Agreement must inform the user of the\n\

-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\

-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\

-          indication of agreement by the user, the provisioning Technology will complete installation\n\

-          of the Installable Software.\n\

-\n\

-Cryptography\n\

-\n\

-Content may contain encryption software. The country in which you are\n\

-currently may have restrictions on the import, possession, and use,\n\

-and/or re-export to another country, of encryption software. BEFORE\n\

-using any encryption software, please check the country's laws,\n\

-regulations and policies concerning the import, possession, or use, and\n\

-re-export of encryption software, to see if this is permitted.\n\

-\n\

-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n

-########### end of license property ##########################################

+# "featureName" property - name of the feature

+featureName=RMF ProR SDK Feature (Incubation)

+

+# "providerName" property - name of the company that provides the feature

+providerName=Eclipse Modeling Project

+

+# "updateSiteName" property - label for the update site

+

+# "description" property - description of the feature

+description=The ProR GUI for ReqIF 1.0.1.

+

+# "copyright" property - text of the "Feature Update Copyright"

+

+

+

+

diff --git a/org.eclipse.rmf.reqif10.pror.sdk.feature/feature.xml b/org.eclipse.rmf.reqif10.pror.sdk.feature/feature.xml
index 67ff73c..919594f 100644
--- a/org.eclipse.rmf.reqif10.pror.sdk.feature/feature.xml
+++ b/org.eclipse.rmf.reqif10.pror.sdk.feature/feature.xml
@@ -1,16 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.rmf.reqif10.pror.sdk.feature"

-      label="RMF ProR SDK Feature (Incubation)"

-      version="0.9.0.qualifier"

-      provider-name="Eclipse Modeling Project"

-      plugin="org.eclipse.rmf.reqif10.pror">

-

-   <description url="http://www.example.com/description">

-      The ProR GUI for ReqIF 1.0.1.

-   </description>

-

-   <copyright url="http://www.formalmind.com">

+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.rmf.reqif10.pror.sdk.feature"
+      label="%featureName"
+      version="0.10.0.qualifier"
+      provider-name="%providerName"
+      plugin="org.eclipse.rmf.reqif10.pror"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.1.qualifier">
+
+   <description url="http://www.example.com/description">
+      %description
+   </description>
+
+   <copyright url="http://www.formalmind.com">
       Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0
@@ -18,65 +20,41 @@
 http://www.eclipse.org/legal/epl-v10.html
 
 Contributors:
-    Michael Jastram - initial API and implementation

-   </copyright>

-

-   <license url="%licenseURL">

-      %license

-   </license>

-

-   <url>

-      <discovery label="RMF at Eclipse.org" url="http://eclipse.org/rmf"/>

-   </url>

-

-   <includes

-         id="org.eclipse.rmf.reqif10.pror.feature"

-         version="0.0.0"/>

-

-   <requires>

-      <import feature="org.eclipse.rmf.reqif10.sdk.feature" version="0.9.0" match="greaterOrEqual"/>

-   </requires>

-

-   <plugin

-         id="org.eclipse.rmf.reqif10.pror.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.rmf.reqif10.pror.edit.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.rmf.reqif10.pror.editor.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.rmf.reqif10.pror.presentation.headline.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.rmf.reqif10.pror.presentation.id.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.rmf.reqif10.pror.presentation.linewrap.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-</feature>

+    Michael Jastram - initial API and implementation
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <discovery label="RMF at Eclipse.org" url="http://eclipse.org/rmf"/>
+   </url>
+
+   <includes
+         id="org.eclipse.rmf.reqif10.pror.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.rmf.reqif10.pror.feature.source"
+         version="0.0.0"/>
+
+   <requires>
+      <import feature="org.eclipse.rmf.reqif10.sdk.feature" version="0.9.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.rmf.reqif10.pror.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rmf.tests.serialization"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.rmf.reqif10.pror.sdk.feature/license.html b/org.eclipse.rmf.reqif10.pror.sdk.feature/license.html
deleted file mode 100644
index 5ef6811..0000000
--- a/org.eclipse.rmf.reqif10.pror.sdk.feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

diff --git a/org.eclipse.rmf.reqif10.pror.sdk.feature/notice.html b/org.eclipse.rmf.reqif10.pror.sdk.feature/notice.html
deleted file mode 100644
index 5ef6811..0000000
--- a/org.eclipse.rmf.reqif10.pror.sdk.feature/notice.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

diff --git a/org.eclipse.rmf.reqif10.pror.sdk.feature/pom.xml b/org.eclipse.rmf.reqif10.pror.sdk.feature/pom.xml
index 6ddcf9d..d8ee8b9 100644
--- a/org.eclipse.rmf.reqif10.pror.sdk.feature/pom.xml
+++ b/org.eclipse.rmf.reqif10.pror.sdk.feature/pom.xml
@@ -6,11 +6,30 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.reqif10.pror.sdk.feature</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<packaging>eclipse-feature</packaging>

 	<groupId>org.eclipse.rmf.features</groupId>

+			<build>

+	<plugins>

+		<plugin>

+				<groupId>org.eclipse.tycho.extras</groupId>

+				<artifactId>tycho-source-feature-plugin</artifactId>

+				<version>${tycho.version}</version>

+				<executions>

+					<execution>

+						<id>source-feature</id>

+						<goals>

+							<goal>source-feature</goal>

+						</goals>

+						<configuration>

+							<skip>true</skip>

+						</configuration>

+					</execution>

+				</executions>

+			</plugin>

+	</plugins>

+	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.tests/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.pror.tests/META-INF/MANIFEST.MF
index 39de340..aea0516 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.pror.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0

 Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName
+Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.reqif10.pror.tests;singleton:=true

-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Require-Bundle: org.junit,

@@ -17,9 +17,8 @@
  org.eclipse.rmf.reqif10.xhtml;bundle-version="0.9.0",

  org.eclipse.rmf.reqif10.serialization;bundle-version="0.9.0"

 Bundle-Vendor: %providerName

-Export-Package: org.eclipse.rmf.reqif10.configuration.tests,

- org.eclipse.rmf.reqif10.pror.testdata,

- org.eclipse.rmf.reqif10.pror.testframework,

- org.eclipse.rmf.reqif10.pror.tests.util

+Export-Package: org.eclipse.rmf.reqif10.pror.configuration.provider,or

+ g.eclipse.rmf.reqif10.pror.testdata,org.eclipse.rmf.reqif10.pror.test

+ framework,org.eclipse.rmf.reqif10.pror.tests.util

 Bundle-ClassPath: lib/mockito-all-1.8.4.jar,

  .

diff --git a/org.eclipse.rmf.reqif10.pror.tests/about.html b/org.eclipse.rmf.reqif10.pror.tests/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/about.html
+++ b/org.eclipse.rmf.reqif10.pror.tests/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.tests/build.properties b/org.eclipse.rmf.reqif10.pror.tests/build.properties
index 2a0ec24..997621b 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/build.properties
+++ b/org.eclipse.rmf.reqif10.pror.tests/build.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,9 +7,14 @@
 #

 # Contributors:

 #     Michael Jastram - initial API and implementation

+###############################################################################

+

 source.. = src/

 output.. = bin/

 bin.includes = META-INF/,\

                .,\

                plugin.properties,\

-               lib/mockito-all-1.8.4.jar

+               lib/mockito-all-1.8.4.jar,\

+               epl-v10.html,\

+               notice.html,\

+               about.html

diff --git a/org.eclipse.rmf.reqif10.pror.tests/epl-v10.html b/org.eclipse.rmf.reqif10.pror.tests/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.pror.tests/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror.tests/notice.html b/org.eclipse.rmf.reqif10.pror.tests/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/notice.html
+++ b/org.eclipse.rmf.reqif10.pror.tests/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.pror.tests/plugin.properties b/org.eclipse.rmf.reqif10.pror.tests/plugin.properties
index 1c0a6db..0dfb93c 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/plugin.properties
+++ b/org.eclipse.rmf.reqif10.pror.tests/plugin.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,5 +7,7 @@
 #

 # Contributors:

 #     Michael Jastram - initial API and implementation

+###############################################################################

+

 pluginName = RMF ProR Tests (Incubation)

 providerName = Eclipse Modeling Project

diff --git a/org.eclipse.rmf.reqif10.pror.tests/pom.xml b/org.eclipse.rmf.reqif10.pror.tests/pom.xml
index 44c0f8c..ecb288e 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/pom.xml
+++ b/org.eclipse.rmf.reqif10.pror.tests/pom.xml
@@ -6,12 +6,11 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<groupId>org.eclipse.rmf.plugins</groupId>

 	<artifactId>org.eclipse.rmf.reqif10.pror.tests</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

@@ -46,7 +45,7 @@
 			<plugin>

 				<groupId>org.eclipse.tycho</groupId>

 				<artifactId>tycho-surefire-plugin</artifactId>

-				<version>${tycho-version}</version>

+				<version>${tycho.version}</version>

 				<configuration>

 					<includes>

 						<include>**/All*Tests.class</include>

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/AllConfigurationTests.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/AllConfigurationTests.java
index 930af84..1395684 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/AllConfigurationTests.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/AllConfigurationTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2012 itemis AG.

+ * Copyright (c) 2012, 2014 itemis AG.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -10,14 +10,31 @@
  ******************************************************************************/

 package org.eclipse.rmf.reqif10.configuration.tests;

 

+import org.eclipse.rmf.reqif10.pror.configuration.provider.ColumnTest;

+import org.eclipse.rmf.reqif10.pror.configuration.provider.ConfigurationUtilTest;

+import org.eclipse.rmf.reqif10.pror.configuration.provider.HeadlineConfigurationTest;

+import org.eclipse.rmf.reqif10.pror.configuration.provider.LabelConfigurationTest;

+import org.eclipse.rmf.reqif10.pror.configuration.provider.LinewrapConfigurationTest;

+import org.eclipse.rmf.reqif10.pror.configuration.provider.ProrGeneralConfigurationTest;

+import org.eclipse.rmf.reqif10.pror.configuration.provider.ProrPresentationConfigurationsTest;

+import org.eclipse.rmf.reqif10.pror.configuration.provider.ProrSpecViewConfigurationTest;

+import org.eclipse.rmf.reqif10.pror.configuration.provider.ProrToolExtensionTest;

 import org.junit.runner.RunWith;

 import org.junit.runners.Suite;

 import org.junit.runners.Suite.SuiteClasses;

 

-

 @RunWith(Suite.class)

-@SuiteClasses({ ProrSpecViewConfigurationTest.class})

-//TODO: Add all other tests

+@SuiteClasses({ 

+	ColumnTest.class, 

+	ConfigurationUtilTest.class,

+	HeadlineConfigurationTest.class,

+	LabelConfigurationTest.class,

+	LinewrapConfigurationTest.class,

+	ProrGeneralConfigurationTest.class,

+	ProrPresentationConfigurationsTest.class,

+	ProrSpecViewConfigurationTest.class,

+	ProrToolExtensionTest.class

+	})

 public class AllConfigurationTests {

 	

 

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/LabelConfigurationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/LabelConfigurationTest.java
deleted file mode 100644
index 3dcd966..0000000
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/LabelConfigurationTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2012 Formal Mind GmbH and University of Dusseldorf.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Michael Jastram - initial API and implementation

- ******************************************************************************/

-

-package org.eclipse.rmf.reqif10.configuration.tests;

-

-import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationFactory;

-import org.eclipse.rmf.reqif10.pror.configuration.LabelConfiguration;

-import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;

-import org.junit.After;

-import org.junit.Before;

-

-/**

- * A test case for the model object '<em><b>Label Configuration</b></em>'.

- */

-public class LabelConfigurationTest extends AbstractItemProviderTest {

-

-	/**

-	 * The fixture for this Label Configuration test case.

-	 */

-	protected LabelConfiguration fixture = null;

-

-	/**

-	 * Sets the fixture for this Label Configuration test case.

-	 */

-	protected void setFixture(LabelConfiguration fixture) {

-		this.fixture = fixture;

-	}

-

-	/**

-	 * Returns the fixture for this Label Configuration test case.

-	 */

-	protected LabelConfiguration getFixture() {

-		return fixture;

-	}

-

-	/**

-	 * @see junit.framework.TestCase#setUp()

-	 */

-	@Before

-	protected void setUp() throws Exception {

-		setFixture(ConfigurationFactory.eINSTANCE.createLabelConfiguration());

-	}

-

-	/**

-	 * @see junit.framework.TestCase#tearDown()

-	 */

-	@After

-	protected void tearDown() throws Exception {

-		setFixture(null);

-	}

-

-} //LabelConfigurationTest

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrGeneralConfigurationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrGeneralConfigurationTest.java
deleted file mode 100644
index 1cc6208..0000000
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrGeneralConfigurationTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2012 Formal Mind GmbH and University of Dusseldorf.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Michael Jastram - initial API and implementation

- ******************************************************************************/

-

-package org.eclipse.rmf.reqif10.configuration.tests;

-

-import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationFactory;

-import org.eclipse.rmf.reqif10.pror.configuration.ProrGeneralConfiguration;

-import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;

-import org.junit.After;

-import org.junit.Before;

-

-/**

- * A test case for the model object '<em><b>Pror General Configuration</b></em>'.

- */

-public class ProrGeneralConfigurationTest extends AbstractItemProviderTest {

-

-	/**

-	 * The fixture for this Pror General Configuration test case.

-	 */

-	protected ProrGeneralConfiguration fixture = null;

-

-	/**

-	 * Sets the fixture for this Pror General Configuration test case.

-	 */

-	protected void setFixture(ProrGeneralConfiguration fixture) {

-		this.fixture = fixture;

-	}

-

-	/**

-	 * Returns the fixture for this Pror General Configuration test case.

-	 */

-	protected ProrGeneralConfiguration getFixture() {

-		return fixture;

-	}

-

-	/**

-	 * @see junit.framework.TestCase#setUp()

-	 */

-	@Before

-	protected void setUp() throws Exception {

-		setFixture(ConfigurationFactory.eINSTANCE.createProrGeneralConfiguration());

-	}

-

-	/**

-	 * @see junit.framework.TestCase#tearDown()

-	 */

-	@After

-	protected void tearDown() throws Exception {

-		setFixture(null);

-	}

-

-} //ProrGeneralConfigurationTest

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrPresentationConfigurationsTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrPresentationConfigurationsTest.java
deleted file mode 100644
index 3046ec9..0000000
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrPresentationConfigurationsTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2012 Formal Mind GmbH and University of Dusseldorf.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Michael Jastram - initial API and implementation

- ******************************************************************************/

-

-package org.eclipse.rmf.reqif10.configuration.tests;

-

-import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationFactory;

-import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfigurations;

-import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;

-import org.junit.After;

-import org.junit.Before;

-

-/**

- * A test case for the model object '<em><b>Pror Presentation Configurations</b></em>'.

- */

-public class ProrPresentationConfigurationsTest extends AbstractItemProviderTest {

-

-	/**

-	 * The fixture for this Pror Presentation Configurations test case.

-	 */

-	protected ProrPresentationConfigurations fixture = null;

-

-	/**

-	 * Sets the fixture for this Pror Presentation Configurations test case.

-	 */

-	protected void setFixture(ProrPresentationConfigurations fixture) {

-		this.fixture = fixture;

-	}

-

-	/**

-	 * Returns the fixture for this Pror Presentation Configurations test case.

-	 */

-	protected ProrPresentationConfigurations getFixture() {

-		return fixture;

-	}

-

-	/**

-	 * @see junit.framework.TestCase#setUp()

-	 */

-	@Before

-	protected void setUp() throws Exception {

-		setFixture(ConfigurationFactory.eINSTANCE.createProrPresentationConfigurations());

-	}

-

-	/**

-	 * @see junit.framework.TestCase#tearDown()

-	 */

-	@After

-	protected void tearDown() throws Exception {

-		setFixture(null);

-	}

-

-} //ProrPresentationConfigurationsTest

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ColumnTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ColumnTest.java
similarity index 94%
rename from org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ColumnTest.java
rename to org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ColumnTest.java
index 7c1fe98..b485432 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ColumnTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ColumnTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2012 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2012, 2014 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -9,7 +9,7 @@
  *     Michael Jastram - initial API and implementation

  ******************************************************************************/

 

-package org.eclipse.rmf.reqif10.configuration.tests;

+package org.eclipse.rmf.reqif10.pror.configuration.provider;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertTrue;

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ConfigurationUtilTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ConfigurationUtilTest.java
similarity index 84%
rename from org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ConfigurationUtilTest.java
rename to org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ConfigurationUtilTest.java
index e597f95..8eead2c 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ConfigurationUtilTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ConfigurationUtilTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2011, 2014 Formal Mind GmbH and University of Dusseldorf.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,22 +8,18 @@
  * Contributors:
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
-package org.eclipse.rmf.reqif10.configuration.tests;
+package org.eclipse.rmf.reqif10.pror.configuration.provider;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap.ValueListIterator;
 import org.eclipse.rmf.reqif10.ReqIF;
 import org.eclipse.rmf.reqif10.ReqIF10Factory;
-import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.ReqIFToolExtension;
-import org.eclipse.rmf.reqif10.impl.ReqIFToolExtensionImpl;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrToolExtension;
-import org.eclipse.rmf.reqif10.pror.configuration.impl.ProrToolExtensionImpl;
 import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.reqif10.pror.util.ConfigurationUtil;
 import org.junit.Test;
diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/HeadlineConfigurationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/HeadlineConfigurationTest.java
new file mode 100644
index 0000000..f1eb475
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/HeadlineConfigurationTest.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Formal Mind GmbH.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Michael Jastram - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.rmf.reqif10.pror.configuration.provider;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineFactory;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.provider.HeadlineItemProviderAdapterFactory;
+import org.junit.Before;
+
+
+public class HeadlineConfigurationTest extends
+		ProrPresentationConfigurationTest {
+	
+	@Before
+	public void setup() {
+		setFixture(HeadlineFactory.eINSTANCE.createHeadlineConfiguration());
+	}
+
+	@Override
+	AdapterFactory createAdapterFactory() {
+		return new HeadlineItemProviderAdapterFactory();
+	}
+
+}
diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/IdConfigurationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/IdConfigurationTest.java
new file mode 100644
index 0000000..a4b19e1
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/IdConfigurationTest.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Formal Mind GmbH.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Michael Jastram - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.rmf.reqif10.pror.configuration.provider;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdFactory;
+import org.eclipse.rmf.reqif10.pror.presentation.id.provider.IdItemProviderAdapterFactory;
+import org.junit.Before;
+
+
+public class IdConfigurationTest extends
+		ProrPresentationConfigurationTest {
+	
+	@Before
+	public void setup() {
+		setFixture(IdFactory.eINSTANCE.createIdConfiguration());
+	}
+
+	@Override
+	AdapterFactory createAdapterFactory() {
+		return new IdItemProviderAdapterFactory();
+	}
+
+}
diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/LabelConfigurationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/LabelConfigurationTest.java
new file mode 100644
index 0000000..9710a51
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/LabelConfigurationTest.java
@@ -0,0 +1,83 @@
+/*******************************************************************************

+ * Copyright (c) 2012, 2014 Formal Mind GmbH and University of Dusseldorf.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *     Michael Jastram - initial API and implementation

+ ******************************************************************************/

+

+package org.eclipse.rmf.reqif10.pror.configuration.provider;

+

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertTrue;

+

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationFactory;

+import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationPackage;

+import org.eclipse.rmf.reqif10.pror.configuration.LabelConfiguration;

+import org.eclipse.rmf.reqif10.pror.configuration.ProrGeneralConfiguration;

+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+/**

+ * A test case for the model object '<em><b>Label Configuration</b></em>'.

+ */

+public class LabelConfigurationTest extends AbstractItemProviderTest {

+

+	/**

+	 * The fixture for this Label Configuration test case.

+	 */

+	protected LabelConfiguration fixture = null;

+

+	/**

+	 * Sets the fixture for this Label Configuration test case.

+	 */

+	protected void setFixture(LabelConfiguration fixture) {

+		this.fixture = fixture;

+	}

+

+	/**

+	 * Returns the fixture for this Label Configuration test case.

+	 */

+	protected LabelConfiguration getFixture() {

+		return fixture;

+	}

+

+	/**

+	 * @see junit.framework.TestCase#setUp()

+	 */

+	@Before

+	public void setUp() throws Exception {

+		setFixture(ConfigurationFactory.eINSTANCE.createLabelConfiguration());

+	}

+

+	/**

+	 * @see junit.framework.TestCase#tearDown()

+	 */

+	@After

+	public void tearDown() throws Exception {

+		setFixture(null);

+	}

+	

+	@Test

+	public void testLabelConfigurationNotification() throws Exception {

+		ProrGeneralConfiguration config = ConfigurationFactory.eINSTANCE

+				.createProrGeneralConfiguration();

+		config.setLabelConfiguration(fixture);

+		ItemProviderAdapter itemProvider = getItemProvider(config);

+		itemProvider.addListener(listener);

+		setViaCommand(

+				fixture,

+				ConfigurationPackage.Literals.LABEL_CONFIGURATION__DEFAULT_LABEL,

+				"new label");

+		assertEquals(1, notifications.size());

+		assertTrue(notifications.get(0) instanceof ViewerNotification);

+	}

+

+} //LabelConfigurationTest

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/LinewrapConfigurationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/LinewrapConfigurationTest.java
new file mode 100644
index 0000000..7e74594
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/LinewrapConfigurationTest.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Formal Mind GmbH.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Michael Jastram - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.rmf.reqif10.pror.configuration.provider;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.rmf.reqif10.pror.presentation.linewrap.LinewrapFactory;
+import org.eclipse.rmf.reqif10.pror.presentation.linewrap.provider.LinewrapItemProviderAdapterFactory;
+import org.junit.Before;
+
+
+public class LinewrapConfigurationTest extends
+		ProrPresentationConfigurationTest {
+	
+	@Before
+	public void setup() {
+		setFixture(LinewrapFactory.eINSTANCE.createLinewrapConfiguration());
+	}
+
+	@Override
+	AdapterFactory createAdapterFactory() {
+		return new LinewrapItemProviderAdapterFactory();
+	}
+
+}
diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrGeneralConfigurationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrGeneralConfigurationTest.java
new file mode 100644
index 0000000..5209e39
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrGeneralConfigurationTest.java
@@ -0,0 +1,131 @@
+/*******************************************************************************

+ * Copyright (c) 2012, 2014 Formal Mind GmbH and University of Dusseldorf.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *     Michael Jastram - initial API and implementation

+ ******************************************************************************/

+

+package org.eclipse.rmf.reqif10.pror.configuration.provider;

+

+import static org.junit.Assert.assertEquals;

+

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+import org.eclipse.rmf.reqif10.ReqIF;

+import org.eclipse.rmf.reqif10.SpecObject;

+import org.eclipse.rmf.reqif10.common.util.ReqIFToolExtensionUtil;

+import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationFactory;

+import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationPackage;

+import org.eclipse.rmf.reqif10.pror.configuration.LabelConfiguration;

+import org.eclipse.rmf.reqif10.pror.configuration.ProrGeneralConfiguration;

+import org.eclipse.rmf.reqif10.pror.configuration.ProrToolExtension;

+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;

+import org.eclipse.rmf.reqif10.pror.util.ProrUtil;

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+/**

+ * A test case for the model object '<em><b>Pror General Configuration</b></em>'.

+ */

+public class ProrGeneralConfigurationTest extends AbstractItemProviderTest {

+

+	/**

+	 * The fixture for this Pror General Configuration test case.

+	 */

+	protected ProrGeneralConfiguration fixture = null;

+

+	/**

+	 * Sets the fixture for this Pror General Configuration test case.

+	 */

+	protected void setFixture(ProrGeneralConfiguration fixture) {

+		this.fixture = fixture;

+	}

+

+	/**

+	 * Returns the fixture for this Pror General Configuration test case.

+	 */

+	protected ProrGeneralConfiguration getFixture() {

+		return fixture;

+	}

+

+	/**

+	 * @see junit.framework.TestCase#setUp()

+	 */

+	@Before

+	public void setUp() throws Exception {

+		setFixture(ConfigurationFactory.eINSTANCE.createProrGeneralConfiguration());

+	}

+

+	/**

+	 * @see junit.framework.TestCase#tearDown()

+	 */

+	@After

+	public void tearDown() throws Exception {

+		setFixture(null);

+	}

+

+	/**

+	 * Test whether changing a label is propagated to the {@link SpecObject}s.

+	 */

+	@Test

+	public void testNotifySpecObjects() throws Exception {

+				

+		ReqIF reqif = getTestReqif("simple.reqif");

+		ProrToolExtension toolExtension = ConfigurationFactory.eINSTANCE

+				.createProrToolExtension();

+		toolExtension.setGeneralConfiguration(fixture);

+		ReqIFToolExtensionUtil.addToolExtension(reqif, toolExtension);

+

+		// We listen to the SpecObject, as it should be notified if the labels change.

+		SpecObject specObject = reqif.getCoreContent().getSpecObjects().get(0);

+		ItemProviderAdapter ip = ProrUtil.getItemProvider(adapterFactory, specObject);

+		ip.addListener(listener);

+		assertEquals(0, notifications.size());

+		

+		LabelConfiguration labelConfiguration = ConfigurationFactory.eINSTANCE.createLabelConfiguration();

+		labelConfiguration.getDefaultLabel().add("Foo");

+

+		// Add the labelConfiguration

+		setViaCommand(

+				fixture,

+				ConfigurationPackage.Literals.PROR_GENERAL_CONFIGURATION__LABEL_CONFIGURATION,

+				labelConfiguration);

+		assertEquals(1, notifications.size());

+

+		// Change the labelConfiguration

+		setViaCommand(

+				labelConfiguration,

+				ConfigurationPackage.Literals.LABEL_CONFIGURATION__DEFAULT_LABEL,

+				"Bar");

+		assertEquals(2, notifications.size());

+}

+

+	/**

+	 * ReqIF

+	 * +-ToolExtensions

+	 *   +-ProrToolExtension

+	 *     +-ProRGeneralConfiguration

+	 * @throws Exception

+	 */

+	@Test

+	public void testNotifyOnChange() throws Exception {

+		ReqIF reqif = getTestReqif("simple.reqif");

+		ProrToolExtension toolExtension = ConfigurationFactory.eINSTANCE

+				.createProrToolExtension();

+		toolExtension.setGeneralConfiguration(fixture);

+		ReqIFToolExtensionUtil.addToolExtension(reqif, toolExtension);

+		ProrUtil.getItemProvider(adapterFactory, fixture).addListener(listener);

+		assertEquals(0, notifications.size());

+		

+		LabelConfiguration labelConfiguration = ConfigurationFactory.eINSTANCE

+				.createLabelConfiguration();

+		fixture.setLabelConfiguration(labelConfiguration);

+		assertEquals(1, notifications.size());

+

+	}

+

+} //ProrGeneralConfigurationTest

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrPresentationConfigurationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrPresentationConfigurationTest.java
similarity index 65%
rename from org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrPresentationConfigurationTest.java
rename to org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrPresentationConfigurationTest.java
index d80bc58..d33bf96 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrPresentationConfigurationTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrPresentationConfigurationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2012 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2012, 2014 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -9,10 +9,11 @@
  *     Michael Jastram - initial API and implementation

  ******************************************************************************/

 

-package org.eclipse.rmf.reqif10.configuration.tests;

+package org.eclipse.rmf.reqif10.pror.configuration.provider;

 

 import static org.junit.Assert.assertEquals;

 

+import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.rmf.reqif10.DatatypeDefinition;

 import org.eclipse.rmf.reqif10.ReqIF10Factory;

 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationFactory;

@@ -20,6 +21,7 @@
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;

 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfigurations;

 import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;

+import org.eclipse.rmf.reqif10.pror.util.ProrUtil;

 import org.junit.Test;

 

 /**

@@ -45,16 +47,38 @@
 	protected ProrPresentationConfiguration getFixture() {

 		return fixture;

 	}

+

 	

+	/**

+	 * Must create a new {@link AdapterFactory} for the Presentation to be tested, e.g.

+	 * <pre>

+	 * return new LinewrapItemProviderAdapterFactory();

+	 * </pre>

+	 */

+	abstract AdapterFactory createAdapterFactory();	

+

 	@Test

 	public void testTypeNotifications() {

-		ProrPresentationConfigurations configs = ConfigurationFactory.eINSTANCE.createProrPresentationConfigurations();

-		setViaCommand(configs, ConfigurationPackage.Literals.PROR_PRESENTATION_CONFIGURATIONS__PRESENTATION_CONFIGURATIONS, fixture);

+		adapterFactory

+				.addAdapterFactory(createAdapterFactory());

+		ProrPresentationConfigurations configs = ConfigurationFactory.eINSTANCE

+				.createProrPresentationConfigurations();

+		ProrPresentationConfigurationsItemProvider ip = (ProrPresentationConfigurationsItemProvider) ProrUtil

+				.getItemProvider(adapterFactory, configs);

+		ip.setEditingDomain(editingDomain);

+		setViaCommand(

+				configs,

+				ConfigurationPackage.Literals.PROR_PRESENTATION_CONFIGURATIONS__PRESENTATION_CONFIGURATIONS,

+				fixture);

 		assertEquals(fixture, configs.getPresentationConfigurations().get(0));

-		

+

 		this.getItemProvider(fixture).addListener(listener);

-		DatatypeDefinition dd = ReqIF10Factory.eINSTANCE.createDatatypeDefinitionString();

-		setViaCommand(fixture, ConfigurationPackage.Literals.PROR_PRESENTATION_CONFIGURATION__DATATYPE, dd);

+		DatatypeDefinition dd = ReqIF10Factory.eINSTANCE

+				.createDatatypeDefinitionString();

+		setViaCommand(

+				fixture,

+				ConfigurationPackage.Literals.PROR_PRESENTATION_CONFIGURATION__DATATYPE,

+				dd);

 		assertEquals(dd, fixture.getDatatype());

 		assertEquals(1, this.notifications.size());

 	}

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrPresentationConfigurationsTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrPresentationConfigurationsTest.java
new file mode 100644
index 0000000..968efbb
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrPresentationConfigurationsTest.java
@@ -0,0 +1,101 @@
+/*******************************************************************************

+ * Copyright (c) 2012, 2014 Formal Mind GmbH and University of Dusseldorf.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *     Michael Jastram - initial API and implementation

+ ******************************************************************************/

+

+package org.eclipse.rmf.reqif10.pror.configuration.provider;

+

+import static org.junit.Assert.assertEquals;

+

+import org.eclipse.rmf.reqif10.ReqIF;

+import org.eclipse.rmf.reqif10.common.util.ReqIFToolExtensionUtil;

+import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationFactory;

+import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationPackage;

+import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfigurations;

+import org.eclipse.rmf.reqif10.pror.configuration.ProrToolExtension;

+import org.eclipse.rmf.reqif10.pror.presentation.linewrap.LinewrapConfiguration;

+import org.eclipse.rmf.reqif10.pror.presentation.linewrap.LinewrapFactory;

+import org.eclipse.rmf.reqif10.pror.presentation.linewrap.provider.LinewrapItemProviderAdapterFactory;

+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;

+import org.eclipse.rmf.reqif10.pror.util.ProrUtil;

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+/**

+ * A test case for the model object '<em><b>Pror Presentation Configurations</b></em>'.

+ */

+public class ProrPresentationConfigurationsTest extends AbstractItemProviderTest {

+

+	/**

+	 * The fixture for this Pror Presentation Configurations test case.

+	 */

+	protected ProrPresentationConfigurations fixture = null;

+

+	/**

+	 * Sets the fixture for this Pror Presentation Configurations test case.

+	 */

+	protected void setFixture(ProrPresentationConfigurations fixture) {

+		this.fixture = fixture;

+	}

+

+	/**

+	 * Returns the fixture for this Pror Presentation Configurations test case.

+	 */

+	protected ProrPresentationConfigurations getFixture() {

+		return fixture;

+	}

+

+	/**

+	 * @see junit.framework.TestCase#setUp()

+	 */

+	@Before

+	public void setUp() throws Exception {

+		setFixture(ConfigurationFactory.eINSTANCE.createProrPresentationConfigurations());

+	}

+

+	/**

+	 * @see junit.framework.TestCase#tearDown()

+	 */

+	@After

+	public void tearDown() throws Exception {

+		setFixture(null);

+	}

+	

+	@Test

+	public void testPresentationRegistration() throws Exception {

+		// We use the LinewrapPresentation just for this test -> Register Factory.

+		adapterFactory

+				.addAdapterFactory(new LinewrapItemProviderAdapterFactory());

+		

+		// Needs an EditingDomain.

+		((ProrPresentationConfigurationsItemProvider) ProrUtil.getItemProvider(

+				adapterFactory, fixture)).setEditingDomain(editingDomain);

+		

+		ReqIF reqif = getTestReqif("simple.reqif");

+		ProrToolExtension toolExtension = ConfigurationFactory.eINSTANCE

+				.createProrToolExtension();

+		toolExtension.setPresentationConfigurations(fixture);

+		ReqIFToolExtensionUtil.addToolExtension(reqif, toolExtension);

+

+		LinewrapConfiguration config = LinewrapFactory.eINSTANCE.createLinewrapConfiguration();

+		ProrPresentationConfigurationItemProvider ip = (ProrPresentationConfigurationItemProvider) ProrUtil

+				.getConfigItemProvider(config, adapterFactory);

+

+		// should trigger registration.

+		setViaCommand(fixture, ConfigurationPackage.Literals.PROR_PRESENTATION_CONFIGURATIONS__PRESENTATION_CONFIGURATIONS, config);

+		assertEquals(ip.getRegisteredConfigurations().size(), 1);

+

+		// should trigger un-registration

+		removeViaCommand(fixture, ConfigurationPackage.Literals.PROR_PRESENTATION_CONFIGURATIONS__PRESENTATION_CONFIGURATIONS, config);

+		assertEquals(ip.getRegisteredConfigurations().size(), 0);

+

+	}

+

+} //ProrPresentationConfigurationsTest

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrSpecViewConfigurationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrSpecViewConfigurationTest.java
similarity index 94%
rename from org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrSpecViewConfigurationTest.java
rename to org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrSpecViewConfigurationTest.java
index 7d79e59..ebf0c66 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrSpecViewConfigurationTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrSpecViewConfigurationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2012 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2012, 2014 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -9,7 +9,7 @@
  *     Michael Jastram - initial API and implementation

  ******************************************************************************/

 

-package org.eclipse.rmf.reqif10.configuration.tests;

+package org.eclipse.rmf.reqif10.pror.configuration.provider;

 

 import static org.junit.Assert.assertEquals;

 

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrToolExtensionTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrToolExtensionTest.java
similarity index 71%
rename from org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrToolExtensionTest.java
rename to org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrToolExtensionTest.java
index 445841d..5be5e23 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrToolExtensionTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/configuration/provider/ProrToolExtensionTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2012 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2012, 2014 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -9,17 +9,22 @@
  *     Michael Jastram - initial API and implementation

  ******************************************************************************/

 

-package org.eclipse.rmf.reqif10.configuration.tests;

+package org.eclipse.rmf.reqif10.pror.configuration.provider;

 

+import org.eclipse.rmf.reqif10.configuration.tests.AllConfigurationTests;

 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationFactory;

 import org.eclipse.rmf.reqif10.pror.configuration.ProrToolExtension;

 import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;

 import org.junit.After;

 import org.junit.Before;

+import org.junit.Test;

 

 /**

  * <!-- begin-user-doc -->

  * A test case for the model object '<em><b>Pror Tool Extension</b></em>'.

+ * As that class is currently generated without modifications, no test is

+ * necessary.  A {@link #placeholderTest()} is included, so that this class can already

+ * be included in {@link AllConfigurationTests}.

  * <!-- end-user-doc -->

  */

 public class ProrToolExtensionTest extends AbstractItemProviderTest {

@@ -47,7 +52,7 @@
 	 * @see junit.framework.TestCase#setUp()

 	 */

 	@Before

-	protected void setUp() throws Exception {

+	public void setUp() throws Exception {

 		setFixture(ConfigurationFactory.eINSTANCE.createProrToolExtension());

 	}

 

@@ -55,8 +60,13 @@
 	 * @see junit.framework.TestCase#tearDown()

 	 */

 	@After

-	protected void tearDown() throws Exception {

+	public void tearDown() throws Exception {

 		setFixture(null);

 	}

+	

+	@Test

+	public void placeholderTest() throws Exception {

+		// Remove this method, once the first real test is added.

+	}

 

 } //ProrToolExtensionTest

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/PresentationServiceManagerTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/PresentationServiceManagerTest.java
index e3bdcb3..0c18b26 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/PresentationServiceManagerTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/PresentationServiceManagerTest.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Formal Mind GmbH, University of Duesseldorf and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Michael Jastram - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.reqif10.pror.editor.presentation.service;
 
 import java.util.Map;
@@ -63,6 +73,7 @@
 
 	@Test
 	public void testMissingPresentationService() {
+		@SuppressWarnings("unused")  // as we don't need bodies.
 		ProrPresentationConfiguration config = new ProrPresentationConfigurationImpl() {
 			public void registerReqIF() {
 			}
diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testdata/TestData.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testdata/TestData.java
index dea7f6f..ab3fffd 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testdata/TestData.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testdata/TestData.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testframework/AbstractItemProviderTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testframework/AbstractItemProviderTest.java
index 7693749..d501fbb 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testframework/AbstractItemProviderTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testframework/AbstractItemProviderTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2014 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -36,11 +36,11 @@
 import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

 import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

 import org.eclipse.rmf.reqif10.ReqIF;

+import org.eclipse.rmf.reqif10.pror.configuration.provider.ConfigurationItemProviderAdapterFactory;

 import org.eclipse.rmf.reqif10.pror.configuration.util.ConfigurationAdapterFactory;

 import org.eclipse.rmf.reqif10.pror.provider.ReqIF10ItemProviderAdapterFactory;

 import org.eclipse.rmf.reqif10.pror.testdata.TestData;

 import org.eclipse.rmf.reqif10.serialization.ReqIF10ResourceFactoryImpl;

-import org.eclipse.rmf.serialization.XMLPersistenceMappingResourceFactoryImpl;

 import org.eclipse.rmf.serialization.XMLPersistenceMappingResourceSetImpl;

 import org.junit.After;

 import org.junit.Before;

@@ -101,6 +101,8 @@
 				.addAdapterFactory(new ReqIF10ItemProviderAdapterFactory());

 		adapterFactory

 				.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

+		adapterFactory

+				.addAdapterFactory(new ConfigurationItemProviderAdapterFactory());

 

 		commandStack = new BasicCommandStack();

 		editingDomain = new AdapterFactoryEditingDomain(adapterFactory,

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testframework/Filter.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testframework/Filter.java
index afe8fcc..09257a3 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testframework/Filter.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testframework/Filter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/tests/util/ReqIfResourceUtils.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/tests/util/ReqIfResourceUtils.java
index 7a047aa..3297c07 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/tests/util/ReqIfResourceUtils.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/tests/util/ReqIfResourceUtils.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/tests/util/ResourceUtils.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/tests/util/ResourceUtils.java
index ec2babc..15b53f8 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/tests/util/ResourceUtils.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/tests/util/ResourceUtils.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/AllUtilTests.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/AllUtilTests.java
index df3acb0..9efd022 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/AllUtilTests.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/AllUtilTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/ConfigurationUtilTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/ConfigurationUtilTest.java
index 4e705d1..264ba88 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/ConfigurationUtilTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/ConfigurationUtilTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/ReadAndWriteReqIF.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/ReadAndWriteReqIF.java
index ca6b3f9..e4ddc6e 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/ReadAndWriteReqIF.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/ReadAndWriteReqIF.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AccessControlledElementTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AccessControlledElementTest.java
index 0a795da..7cc967d 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AccessControlledElementTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AccessControlledElementTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderAttributeDefinitionTests.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderAttributeDefinitionTests.java
index 2cab83b..e10b403 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderAttributeDefinitionTests.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderAttributeDefinitionTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderAttributeValueTests.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderAttributeValueTests.java
index fad9582..e681800 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderAttributeValueTests.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderAttributeValueTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderDatatypeDefinitionTests.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderDatatypeDefinitionTests.java
index fe60187..d18554c 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderDatatypeDefinitionTests.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderDatatypeDefinitionTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderTests.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderTests.java
index 375eddb..c2e9dec 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderTests.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AlternativeIdTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AlternativeIdTest.java
index bea24e6..8e4e48b 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AlternativeIdTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AlternativeIdTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionBooleanTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionBooleanTest.java
index e925677..3c3be87 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionBooleanTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionBooleanTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionDateTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionDateTest.java
index 6155431..1be2f43 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionDateTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionDateTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionEnumerationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionEnumerationTest.java
index a525141..7c2fbba 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionEnumerationTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionEnumerationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionIntegerTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionIntegerTest.java
index e8cb29b..32bd13d 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionIntegerTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionIntegerTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionRealTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionRealTest.java
index c5fb6fc..b5fe7f0 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionRealTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionRealTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionSimpleTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionSimpleTest.java
index 4ff8c14..abec87a 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionSimpleTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionSimpleTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionStringTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionStringTest.java
index 6335949..dff7abb 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionStringTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionStringTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionTest.java
index 2917a1c..85e2b27 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionXhtmlTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionXhtmlTest.java
index b50acdc..7006cf4 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionXhtmlTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionXhtmlTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueBooleanTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueBooleanTest.java
index a4f9730..fd3ffa1 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueBooleanTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueBooleanTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueDateTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueDateTest.java
index e82f63a..d9c64c3 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueDateTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueDateTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueEnumerationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueEnumerationTest.java
index e184f5d..4547faa 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueEnumerationTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueEnumerationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueIntegerTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueIntegerTest.java
index 4ad29ba..378767f 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueIntegerTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueIntegerTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueRealTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueRealTest.java
index 0590f03..21f968f 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueRealTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueRealTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueSimpleTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueSimpleTest.java
index b9c8ef0..cd66882 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueSimpleTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueSimpleTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueStringTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueStringTest.java
index 71880e6..73f87f3 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueStringTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueStringTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueTest.java
index dc4b168..917240d 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -10,15 +10,11 @@
  ******************************************************************************/

 package org.eclipse.rmf.reqif10.provider;

 

-import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.*;

 

 import java.net.URISyntaxException;

 import java.util.GregorianCalendar;

 

-import javax.xml.datatype.XMLGregorianCalendar;

-

-import junit.framework.Assert;

-

 import org.eclipse.rmf.reqif10.AttributeValue;

 import org.eclipse.rmf.reqif10.ReqIF;

 import org.eclipse.rmf.reqif10.SpecObject;

@@ -78,7 +74,7 @@
 		GregorianCalendar lastChangeBefore = specObject.getLastChange();

 		ProrUtil.setTheValue(getFixture(), getValueObject(), editingDomain);

 		GregorianCalendar lastChangeAfter = specObject.getLastChange();

-		Assert.assertNotSame(lastChangeAfter, lastChangeBefore);

+		assertTrue(lastChangeAfter != lastChangeBefore);

 	}

 	

 	/**

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueXhtmlTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueXhtmlTest.java
index 87c16e5..d16353e 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueXhtmlTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueXhtmlTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionBooleanTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionBooleanTest.java
index 745f74a..b240bf8 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionBooleanTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionBooleanTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionDateTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionDateTest.java
index f6e8b44..6ebee13 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionDateTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionDateTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionEnumerationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionEnumerationTest.java
index b23b7bc..1b3afeb 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionEnumerationTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionEnumerationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionIntegerTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionIntegerTest.java
index 19afc82..45a6f4e 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionIntegerTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionIntegerTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionRealTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionRealTest.java
index d1ef8c6..280cf5b 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionRealTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionRealTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionSimpleTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionSimpleTest.java
index 929b0c7..e2bdf9a 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionSimpleTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionSimpleTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionStringTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionStringTest.java
index 1ec34e7..a923069 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionStringTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionStringTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionTest.java
index 901634d..be039d4 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionXhtmlTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionXhtmlTest.java
index 7d262b1..10f4ab4 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionXhtmlTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionXhtmlTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/EmbeddedValueTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/EmbeddedValueTest.java
index 944aecb..8e4e632 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/EmbeddedValueTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/EmbeddedValueTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/EnumValueTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/EnumValueTest.java
index 37a799c..ba1eff7 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/EnumValueTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/EnumValueTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/IdentifiableTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/IdentifiableTest.java
index 92bcb1b..bbd4f09 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/IdentifiableTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/IdentifiableTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/RelationGroupTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/RelationGroupTest.java
index 4bfa542..733c14c 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/RelationGroupTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/RelationGroupTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/RelationGroupTypeTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/RelationGroupTypeTest.java
index 24cf2e7..b35eacb 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/RelationGroupTypeTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/RelationGroupTypeTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfContentTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfContentTest.java
index 5373c74..f5318d2 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfContentTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfContentTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfHeaderTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfHeaderTest.java
index b7b1d31..2f8de61 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfHeaderTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfHeaderTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfTest.java
index 563754f..56da20d 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecElementWithAttributesTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecElementWithAttributesTest.java
index 948d38a..252a3bd 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecElementWithAttributesTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecElementWithAttributesTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecHierarchyTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecHierarchyTest.java
index 7f87f66..0fedf7f 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecHierarchyTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecHierarchyTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecObjectTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecObjectTest.java
index 682baa9..36edf4e 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecObjectTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecObjectTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecObjectTypeTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecObjectTypeTest.java
index 0ead603..6d1a71b 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecObjectTypeTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecObjectTypeTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecRelationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecRelationTest.java
index 683691e..f46b16c 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecRelationTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecRelationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecRelationTypeTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecRelationTypeTest.java
index 299967d..a4d1088 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecRelationTypeTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecRelationTypeTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecTypeTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecTypeTest.java
index 20bdb76..9333996 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecTypeTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecTypeTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecificationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecificationTest.java
index aeca46a..3a84298 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecificationTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecificationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecificationTypeTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecificationTypeTest.java
index 42be36b..28bdf83 100644
--- a/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecificationTypeTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecificationTypeTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.pror/META-INF/MANIFEST.MF
index b61c922..e1a70e6 100644
--- a/org.eclipse.rmf.reqif10.pror/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.pror/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.reqif10.pror;singleton:=true

-Bundle-Version: 0.9.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Bundle-ClassPath: .

 Bundle-Localization: plugin

 Require-Bundle: org.eclipse.emf.ecore,

@@ -11,8 +11,8 @@
  org.eclipse.rmf.reqif10.common;bundle-version="0.9.0";visibility:=reexport,

  org.eclipse.ui;bundle-version="3.7.0",

  org.eclipse.core.runtime;bundle-version="3.7.0"

-Export-Package: org.eclipse.rmf.reqif10.pror.configuration,

- org.eclipse.rmf.reqif10.pror.configuration.impl,

- org.eclipse.rmf.reqif10.pror.configuration.util

+Export-Package: org.eclipse.rmf.reqif10.pror.configuration,org.eclipse

+ .rmf.reqif10.pror.configuration.impl,org.eclipse.rmf.reqif10.pror.con

+ figuration.util

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Bundle-Vendor: %providerName

diff --git a/org.eclipse.rmf.reqif10.pror/about.html b/org.eclipse.rmf.reqif10.pror/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror/about.html
+++ b/org.eclipse.rmf.reqif10.pror/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror/about.ini b/org.eclipse.rmf.reqif10.pror/about.ini
index d83d877..56fa35c 100644
--- a/org.eclipse.rmf.reqif10.pror/about.ini
+++ b/org.eclipse.rmf.reqif10.pror/about.ini
@@ -1,3 +1,3 @@
 featureImage=prorFeature.png

-appName=ProR Requirements Engineering Platform

-aboutText=%blurb

+appName=%featureName

+aboutText=%featureText

diff --git a/org.eclipse.rmf.reqif10.pror/about.mappings b/org.eclipse.rmf.reqif10.pror/about.mappings
new file mode 100644
index 0000000..87ee85b
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.pror/about.mappings
@@ -0,0 +1,4 @@
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
diff --git a/org.eclipse.rmf.reqif10.pror/about.properties b/org.eclipse.rmf.reqif10.pror/about.properties
index 230681b..081ab08 100644
--- a/org.eclipse.rmf.reqif10.pror/about.properties
+++ b/org.eclipse.rmf.reqif10.pror/about.properties
@@ -1,9 +1,21 @@
-blurb=Copyright (c) 2012 Formal Mind GmbH, itemis AG and University of Dusseldorf.\n\

-All rights reserved. This program and the accompanying materials\n\

-are made available under the terms of the Eclipse Public License v1.0\n\

-which accompanies this distribution, and is available at\n\

-http://www.eclipse.org/legal/epl-v10.html\n\

+###############################################################################

+# Copyright (c) 2014 Formal Mind GmbH, University of Duesseldorf and others.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     Michael Jastram - initial API and implementation

+###############################################################################    

+featureName=RMF/ProR - ProR Requirements Engineering Platform

+

+featureText=RMF/ProR - ProR Requirements Engineering Platform\n\

+Version: {featureVersion}\n\

+Build id: {0}\n\

 \n\

-Contributors:\n\

-    Michael Jastram - initial API and implementation\n\

+(c) Copyright Eclipse contributors and others. 2011, 2014.  All rights reserved.\n\

+\n\

+The ProR GUI for the OMG ReqIF standard\n\

+Visit http://www.eclipse.org/rmf/

     
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror/build.properties b/org.eclipse.rmf.reqif10.pror/build.properties
index b2ab449..4c3b148 100644
--- a/org.eclipse.rmf.reqif10.pror/build.properties
+++ b/org.eclipse.rmf.reqif10.pror/build.properties
@@ -1,3 +1,13 @@
+###############################################################################

+# Copyright (c) 2014 Formal Mind GmbH, University of Duesseldorf and others.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     Michael Jastram - initial API and implementation

+###############################################################################

 bin.includes = .,\

                model/,\

                META-INF/,\

@@ -10,7 +20,11 @@
                plugin_customization.ini,\

                prorFeature.png,\

                about.ini,\

-               about.properties

+               about.properties,\

+               notice.html,\

+               epl-v10.html,\

+               about.html,\

+               about.mappings

 output.. = bin/

 jars.compile.order = .

 source.. = src/

diff --git a/org.eclipse.rmf.reqif10.pror/epl-v10.html b/org.eclipse.rmf.reqif10.pror/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.reqif10.pror/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.pror/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror/notice.html b/org.eclipse.rmf.reqif10.pror/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.reqif10.pror/notice.html
+++ b/org.eclipse.rmf.reqif10.pror/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.pror/plugin.properties b/org.eclipse.rmf.reqif10.pror/plugin.properties
index 85bf2d4..754a887 100644
--- a/org.eclipse.rmf.reqif10.pror/plugin.properties
+++ b/org.eclipse.rmf.reqif10.pror/plugin.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+###############################################################################

+# Copyright (c) 2011, 2014 Formal Mind GmbH, University of Duesseldorf and others.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,5 +7,6 @@
 #

 # Contributors:

 #     Michael Jastram - initial API and implementation

+###############################################################################

 pluginName = RMF ProR Model (Incubation)

 providerName = Eclipse Modeling Project

diff --git a/org.eclipse.rmf.reqif10.pror/pom.xml b/org.eclipse.rmf.reqif10.pror/pom.xml
index 01b0c40..5f5979c 100644
--- a/org.eclipse.rmf.reqif10.pror/pom.xml
+++ b/org.eclipse.rmf.reqif10.pror/pom.xml
@@ -6,31 +6,13 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.reqif10.pror</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

 	<groupId>org.eclipse.rmf.plugins</groupId>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

- 	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.eclipse.tycho</groupId>

-				<artifactId>tycho-source-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<executions>

-					<execution>

-						<id>plugin-source</id>

-						<goals>

-							<goal>plugin-source</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/Column.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/Column.java
index 7157fd3..61be870 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/Column.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/Column.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ConfigurationFactory.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ConfigurationFactory.java
index beaf6bd..412ed28 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ConfigurationFactory.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ConfigurationFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2012 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ConfigurationPackage.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ConfigurationPackage.java
index 7ab810f..190fc73 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ConfigurationPackage.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ConfigurationPackage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/LabelConfiguration.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/LabelConfiguration.java
index 6a2fdb7..8aaf38f 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/LabelConfiguration.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/LabelConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrGeneralConfiguration.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrGeneralConfiguration.java
index 8d01d0d..a9e964b 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrGeneralConfiguration.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrGeneralConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrPresentationConfiguration.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrPresentationConfiguration.java
index 0462f5a..827e1d8 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrPresentationConfiguration.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrPresentationConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrPresentationConfigurations.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrPresentationConfigurations.java
index 3dc5816..ebfe44e 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrPresentationConfigurations.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrPresentationConfigurations.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrSpecViewConfiguration.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrSpecViewConfiguration.java
index 265f34a..8a29546 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrSpecViewConfiguration.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrSpecViewConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrToolExtension.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrToolExtension.java
index e180062..294283c 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrToolExtension.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/ProrToolExtension.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ColumnImpl.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ColumnImpl.java
index d34f1d2..0299cb5 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ColumnImpl.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ColumnImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ConfigurationFactoryImpl.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ConfigurationFactoryImpl.java
index f1c7607..7592504 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ConfigurationFactoryImpl.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ConfigurationFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ConfigurationPackageImpl.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ConfigurationPackageImpl.java
index 6ed2911..29210fe 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ConfigurationPackageImpl.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ConfigurationPackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/LabelConfigurationImpl.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/LabelConfigurationImpl.java
index bb15676..efd7fde 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/LabelConfigurationImpl.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/LabelConfigurationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrGeneralConfigurationImpl.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrGeneralConfigurationImpl.java
index 859b068..28013c0 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrGeneralConfigurationImpl.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrGeneralConfigurationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrPresentationConfigurationImpl.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrPresentationConfigurationImpl.java
index e2f93c4..338dbc2 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrPresentationConfigurationImpl.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrPresentationConfigurationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrPresentationConfigurationsImpl.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrPresentationConfigurationsImpl.java
index c4fa08a..e2eb43e 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrPresentationConfigurationsImpl.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrPresentationConfigurationsImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrSpecViewConfigurationImpl.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrSpecViewConfigurationImpl.java
index 448311b..6797911 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrSpecViewConfigurationImpl.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrSpecViewConfigurationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrToolExtensionImpl.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrToolExtensionImpl.java
index beaccc8..eb4e49b 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrToolExtensionImpl.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/impl/ProrToolExtensionImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/util/ConfigurationAdapterFactory.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/util/ConfigurationAdapterFactory.java
index f7f6adf..21a62a6 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/util/ConfigurationAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/util/ConfigurationAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/util/ConfigurationSwitch.java b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/util/ConfigurationSwitch.java
index 9f30e2c..f4ef911 100644
--- a/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/util/ConfigurationSwitch.java
+++ b/org.eclipse.rmf.reqif10.pror/src/org/eclipse/rmf/reqif10/pror/configuration/util/ConfigurationSwitch.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.

+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.reqif10.sdk.feature/about.properties b/org.eclipse.rmf.reqif10.sdk.feature/about.properties
deleted file mode 100644
index e4f04ec..0000000
--- a/org.eclipse.rmf.reqif10.sdk.feature/about.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-blurb=Copyright (c) 2011 itemis GmbH.\n\

-All rights reserved. This program and the accompanying materials\n\

-are made available under the terms of the Eclipse Public License v1.0\n\

-which accompanies this distribution, and is available at\n\

-http://www.eclipse.org/legal/epl-v10.html\n\

-\n\

-Contributors:\n\

-    Nirmal Sasidharan - initial API and implementation\n\

-    
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.sdk.feature/build.properties b/org.eclipse.rmf.reqif10.sdk.feature/build.properties
index f5dd2c4..7b35999 100644
--- a/org.eclipse.rmf.reqif10.sdk.feature/build.properties
+++ b/org.eclipse.rmf.reqif10.sdk.feature/build.properties
@@ -1,14 +1,12 @@
-# Copyright (c) 2011 itemis GmbH.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     Nirmal Sasidharan - initial API and implementation

-bin.includes = feature.xml,\

-               feature.properties,\

-               epl-v10.html,\

-               about.properties,\

-               license.html,\

-               notice.html

+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.sdk.feature/epl-v10.html b/org.eclipse.rmf.reqif10.sdk.feature/epl-v10.html
deleted file mode 100644
index 813c07d..0000000
--- a/org.eclipse.rmf.reqif10.sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

diff --git a/org.eclipse.rmf.reqif10.sdk.feature/feature.properties b/org.eclipse.rmf.reqif10.sdk.feature/feature.properties
index 704ede0..d7b22d1 100644
--- a/org.eclipse.rmf.reqif10.sdk.feature/feature.properties
+++ b/org.eclipse.rmf.reqif10.sdk.feature/feature.properties
@@ -1,131 +1,32 @@
-# "licenseURL" property - URL of the "Feature License"

-# do not translate value - just change to point to a locale-specific HTML page

-licenseURL=license.html

+###############################################################################

+# Copyright (c) 2014 itemis AG and others.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     Mark Broerkens (itemis AG) - initial API and implementation

+###############################################################################

+# feature.properties

+# contains externalized strings for feature.xml

+# "%foo" in feature.xml corresponds to the key "foo" in this file

+# java.io.Properties file (ISO 8859-1 with "\\" escapes)

+# This file should be translated.

 

-# "license" property - text of the "Feature Update License"

-# should be plain text version of license agreement pointed to be "licenseURL"

-license=\

-Eclipse Foundation Software User Agreement\n\

-February 1, 2011\n\

-\n\

-Usage Of Content\n\

-\n\

-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\

-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\

-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\

-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\

-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\

-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\

-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\

-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\

-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\

-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\

-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\

-\n\

-Applicable Licenses\n\

-\n\

-Unless otherwise indicated, all Content made available by the\n\

-Eclipse Foundation is provided to you under the terms and conditions of\n\

-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\

-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\

-For purposes of the EPL, "Program" will mean the Content.\n\

-\n\

-Content includes, but is not limited to, source code, object code,\n\

-documentation and other files maintained in the Eclipse Foundation source code\n\

-repository ("Repository") in software modules ("Modules") and made available\n\

-as downloadable archives ("Downloads").\n\

-\n\

-       - Content may be structured and packaged into modules to facilitate delivering,\n\

-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\

-         plug-in fragments ("Fragments"), and features ("Features").\n\

-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\

-         in a directory named "plugins".\n\

-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\

-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\

-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\

-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\

-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\

-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\

-\n\

-The terms and conditions governing Plug-ins and Fragments should be\n\

-contained in files named "about.html" ("Abouts"). The terms and\n\

-conditions governing Features and Included Features should be contained\n\

-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\

-Licenses may be located in any directory of a Download or Module\n\

-including, but not limited to the following locations:\n\

-\n\

-       - The top-level (root) directory\n\

-       - Plug-in and Fragment directories\n\

-       - Inside Plug-ins and Fragments packaged as JARs\n\

-       - Sub-directories of the directory named "src" of certain Plug-ins\n\

-       - Feature directories\n\

-\n\

-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\

-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\

-Update License") during the installation process. If the Feature contains\n\

-Included Features, the Feature Update License should either provide you\n\

-with the terms and conditions governing the Included Features or inform\n\

-you where you can locate them. Feature Update Licenses may be found in\n\

-the "license" property of files named "feature.properties" found within a Feature.\n\

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\

-terms and conditions (or references to such terms and conditions) that\n\

-govern your use of the associated Content in that directory.\n\

-\n\

-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\

-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\

-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\

-\n\

-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\

-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\

-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\

-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\

-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\

-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\

-\n\

-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\

-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\

-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\

-govern that particular Content.\n\

-\n\

-\n\Use of Provisioning Technology\n\

-\n\

-The Eclipse Foundation makes available provisioning software, examples of which include,\n\

-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\

-the purpose of allowing users to install software, documentation, information and/or\n\

-other materials (collectively "Installable Software"). This capability is provided with\n\

-the intent of allowing such users to install, extend and update Eclipse-based products.\n\

-Information about packaging Installable Software is available at\n\

-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\

-\n\

-You may use Provisioning Technology to allow other parties to install Installable Software.\n\

-You shall be responsible for enabling the applicable license agreements relating to the\n\

-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\

-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\

-making it available in accordance with the Specification, you further acknowledge your\n\

-agreement to, and the acquisition of all necessary rights to permit the following:\n\

-\n\

-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\

-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\

-          extending or updating the functionality of an Eclipse-based product.\n\

-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\

-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\

-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\

-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\

-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\

-          with the Specification. Such Installable Software Agreement must inform the user of the\n\

-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\

-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\

-          indication of agreement by the user, the provisioning Technology will complete installation\n\

-          of the Installable Software.\n\

-\n\

-Cryptography\n\

-\n\

-Content may contain encryption software. The country in which you are\n\

-currently may have restrictions on the import, possession, and use,\n\

-and/or re-export to another country, of encryption software. BEFORE\n\

-using any encryption software, please check the country's laws,\n\

-regulations and policies concerning the import, possession, or use, and\n\

-re-export of encryption software, to see if this is permitted.\n\

-\n\

-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n

-########### end of license property ##########################################

+# "featureName" property - name of the feature

+featureName=RMF Core ReqIF SDK Feature (Incubation)

+

+# "providerName" property - name of the company that provides the feature

+providerName=Eclipse Modeling Project

+

+# "updateSiteName" property - label for the update site

+

+# "description" property - description of the feature

+description=An EMF-based implementation of ReqIf 1.0.1

+

+# "copyright" property - text of the "Feature Update Copyright"

+

+

+

+

diff --git a/org.eclipse.rmf.reqif10.sdk.feature/feature.xml b/org.eclipse.rmf.reqif10.sdk.feature/feature.xml
index 467f854..0683fa7 100644
--- a/org.eclipse.rmf.reqif10.sdk.feature/feature.xml
+++ b/org.eclipse.rmf.reqif10.sdk.feature/feature.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.rmf.reqif10.sdk.feature"
-      label="RMF Core ReqIF SDK Feature (Incubation)"
-      version="0.9.0.qualifier"
-      provider-name="Eclipse Modeling Project"
-      plugin="org.eclipse.rmf.reqif10">
+      label="%featureName"
+      version="0.10.0.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.1.qualifier">
 
    <description url="http://www.eclipse.org/rmf">
-      An EMF-based implementation of ReqIf 1.0.1
+      %description
    </description>
 
    <copyright url="http://itemis.com/">
-      Copyright (c) 2012 itemis AG.
+      Copyright (c) 2012 itemis AG and others.
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License
 v1.0
@@ -29,22 +30,12 @@
          id="org.eclipse.rmf.reqif10.feature"
          version="0.0.0"/>
 
-   <plugin
-         id="org.eclipse.rmf.reqif10.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <includes
+         id="org.eclipse.rmf.reqif10.feature.source"
+         version="0.0.0"/>
 
    <plugin
-         id="org.eclipse.rmf.serialization.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rmf.reqif10.common.source"
+         id="org.eclipse.rmf.tests.reqif10.serialization"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/org.eclipse.rmf.reqif10.sdk.feature/license.html b/org.eclipse.rmf.reqif10.sdk.feature/license.html
deleted file mode 100644
index 5ef6811..0000000
--- a/org.eclipse.rmf.reqif10.sdk.feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

diff --git a/org.eclipse.rmf.reqif10.sdk.feature/notice.html b/org.eclipse.rmf.reqif10.sdk.feature/notice.html
deleted file mode 100644
index 5ef6811..0000000
--- a/org.eclipse.rmf.reqif10.sdk.feature/notice.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

diff --git a/org.eclipse.rmf.reqif10.sdk.feature/pom.xml b/org.eclipse.rmf.reqif10.sdk.feature/pom.xml
index 4ef16d4..f94e210 100644
--- a/org.eclipse.rmf.reqif10.sdk.feature/pom.xml
+++ b/org.eclipse.rmf.reqif10.sdk.feature/pom.xml
@@ -6,11 +6,30 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.reqif10.sdk.feature</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<packaging>eclipse-feature</packaging>

 	<groupId>org.eclipse.rmf.features</groupId>

+		<build>

+	<plugins>

+		<plugin>

+				<groupId>org.eclipse.tycho.extras</groupId>

+				<artifactId>tycho-source-feature-plugin</artifactId>

+				<version>${tycho.version}</version>

+				<executions>

+					<execution>

+						<id>source-feature</id>

+						<goals>

+							<goal>source-feature</goal>

+						</goals>

+						<configuration>

+							<skip>true</skip>

+						</configuration>

+					</execution>

+				</executions>

+			</plugin>

+	</plugins>

+	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.serialization/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.serialization/META-INF/MANIFEST.MF
index 48b580c..f815490 100644
--- a/org.eclipse.rmf.reqif10.serialization/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.serialization/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rmf.reqif10.serialization
-Bundle-Version: 0.9.0.qualifier
+Bundle-SymbolicName: org.eclipse.rmf.reqif10.serialization;singleton:=true
+Bundle-Version: 0.10.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.rmf.serialization;bundle-version="0.9.0",
  org.eclipse.rmf.reqif10;bundle-version="0.9.0",
diff --git a/org.eclipse.rmf.reqif10.serialization/about.html b/org.eclipse.rmf.reqif10.serialization/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.serialization/about.html
+++ b/org.eclipse.rmf.reqif10.serialization/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.serialization/build.properties b/org.eclipse.rmf.reqif10.serialization/build.properties
index 27befd0..7900be1 100644
--- a/org.eclipse.rmf.reqif10.serialization/build.properties
+++ b/org.eclipse.rmf.reqif10.serialization/build.properties
@@ -1,3 +1,13 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 # Copyright (c) 2013 itemis AG.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +21,11 @@
 bin.includes = .,\
                schema/,\
                META-INF/,\
-               plugin.properties
+               plugin.properties,\
+               plugin.xml,\
+               about.html,\
+               epl-v10.html,\
+               notice.html
 jars.compile.order = .
 source.. = src/
 output.. = bin/
diff --git a/org.eclipse.rmf.reqif10.serialization/epl-v10.html b/org.eclipse.rmf.reqif10.serialization/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.reqif10.serialization/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.serialization/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.serialization/notice.html b/org.eclipse.rmf.reqif10.serialization/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.reqif10.serialization/notice.html
+++ b/org.eclipse.rmf.reqif10.serialization/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.serialization/plugin.properties b/org.eclipse.rmf.reqif10.serialization/plugin.properties
index 1c9895a..38b1fc3 100644
--- a/org.eclipse.rmf.reqif10.serialization/plugin.properties
+++ b/org.eclipse.rmf.reqif10.serialization/plugin.properties
@@ -1,3 +1,13 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 # Copyright (c) 2013 itemis AG.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
diff --git a/org.eclipse.rmf.reqif10.serialization/plugin.xml b/org.eclipse.rmf.reqif10.serialization/plugin.xml
new file mode 100644
index 0000000..4017f27
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.serialization/plugin.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+       point="org.eclipse.emf.ecore.extension_parser">
+    <parser
+          class="org.eclipse.rmf.reqif10.serialization.ReqIF10ResourceFactoryImpl"
+          type="reqif">
+    </parser>
+ </extension>
+</plugin>
diff --git a/org.eclipse.rmf.reqif10.serialization/pom.xml b/org.eclipse.rmf.reqif10.serialization/pom.xml
index d342a23..021fa0b 100644
--- a/org.eclipse.rmf.reqif10.serialization/pom.xml
+++ b/org.eclipse.rmf.reqif10.serialization/pom.xml
@@ -19,31 +19,13 @@
 	<parent>
 		<groupId>org.eclipse.rmf</groupId>
 		<artifactId>org.eclipse.rmf.releng</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.10.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.rmf.reqif10.serialization</artifactId>
-	<version>0.9.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.rmf.plugins</groupId>
 	<properties>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   	</properties>
- 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>plugin-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.serialization/src/org/eclipse/rmf/reqif10/serialization/ReqIF10ResourceFactoryImpl.java b/org.eclipse.rmf.reqif10.serialization/src/org/eclipse/rmf/reqif10/serialization/ReqIF10ResourceFactoryImpl.java
index 0e1664b..0fa4fe0 100644
--- a/org.eclipse.rmf.reqif10.serialization/src/org/eclipse/rmf/reqif10/serialization/ReqIF10ResourceFactoryImpl.java
+++ b/org.eclipse.rmf.reqif10.serialization/src/org/eclipse/rmf/reqif10/serialization/ReqIF10ResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.reqif10.serialization/src/org/eclipse/rmf/reqif10/serialization/ReqIF10ResourceImpl.java b/org.eclipse.rmf.reqif10.serialization/src/org/eclipse/rmf/reqif10/serialization/ReqIF10ResourceImpl.java
index 9021f90..79cd7db 100644
--- a/org.eclipse.rmf.reqif10.serialization/src/org/eclipse/rmf/reqif10/serialization/ReqIF10ResourceImpl.java
+++ b/org.eclipse.rmf.reqif10.serialization/src/org/eclipse/rmf/reqif10/serialization/ReqIF10ResourceImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.reqif10.thirdparty.feature/about.properties b/org.eclipse.rmf.reqif10.thirdparty.feature/about.properties
deleted file mode 100644
index e4f04ec..0000000
--- a/org.eclipse.rmf.reqif10.thirdparty.feature/about.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-blurb=Copyright (c) 2011 itemis GmbH.\n\

-All rights reserved. This program and the accompanying materials\n\

-are made available under the terms of the Eclipse Public License v1.0\n\

-which accompanies this distribution, and is available at\n\

-http://www.eclipse.org/legal/epl-v10.html\n\

-\n\

-Contributors:\n\

-    Nirmal Sasidharan - initial API and implementation\n\

-    
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.thirdparty.feature/build.properties b/org.eclipse.rmf.reqif10.thirdparty.feature/build.properties
index 39de2f2..7b35999 100644
--- a/org.eclipse.rmf.reqif10.thirdparty.feature/build.properties
+++ b/org.eclipse.rmf.reqif10.thirdparty.feature/build.properties
@@ -1,6 +1,12 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
-               about.properties,\
-               epl-v10.html,\
-               feature.properties,\
-               license.html,\
-               notice.html
+               feature.properties
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.thirdparty.feature/epl-v10.html b/org.eclipse.rmf.reqif10.thirdparty.feature/epl-v10.html
deleted file mode 100644
index 813c07d..0000000
--- a/org.eclipse.rmf.reqif10.thirdparty.feature/epl-v10.html
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

diff --git a/org.eclipse.rmf.reqif10.thirdparty.feature/feature.properties b/org.eclipse.rmf.reqif10.thirdparty.feature/feature.properties
index 704ede0..4d5fb0e 100644
--- a/org.eclipse.rmf.reqif10.thirdparty.feature/feature.properties
+++ b/org.eclipse.rmf.reqif10.thirdparty.feature/feature.properties
@@ -1,131 +1,32 @@
-# "licenseURL" property - URL of the "Feature License"

-# do not translate value - just change to point to a locale-specific HTML page

-licenseURL=license.html

+###############################################################################

+# Copyright (c) 2014 itemis AG and others.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     Mark Broerkens (itemis AG) - initial API and implementation

+###############################################################################

+# feature.properties

+# contains externalized strings for feature.xml

+# "%foo" in feature.xml corresponds to the key "foo" in this file

+# java.io.Properties file (ISO 8859-1 with "\\" escapes)

+# This file should be translated.

 

-# "license" property - text of the "Feature Update License"

-# should be plain text version of license agreement pointed to be "licenseURL"

-license=\

-Eclipse Foundation Software User Agreement\n\

-February 1, 2011\n\

-\n\

-Usage Of Content\n\

-\n\

-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\

-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\

-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\

-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\

-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\

-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\

-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\

-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\

-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\

-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\

-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\

-\n\

-Applicable Licenses\n\

-\n\

-Unless otherwise indicated, all Content made available by the\n\

-Eclipse Foundation is provided to you under the terms and conditions of\n\

-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\

-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\

-For purposes of the EPL, "Program" will mean the Content.\n\

-\n\

-Content includes, but is not limited to, source code, object code,\n\

-documentation and other files maintained in the Eclipse Foundation source code\n\

-repository ("Repository") in software modules ("Modules") and made available\n\

-as downloadable archives ("Downloads").\n\

-\n\

-       - Content may be structured and packaged into modules to facilitate delivering,\n\

-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\

-         plug-in fragments ("Fragments"), and features ("Features").\n\

-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\

-         in a directory named "plugins".\n\

-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\

-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\

-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\

-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\

-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\

-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\

-\n\

-The terms and conditions governing Plug-ins and Fragments should be\n\

-contained in files named "about.html" ("Abouts"). The terms and\n\

-conditions governing Features and Included Features should be contained\n\

-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\

-Licenses may be located in any directory of a Download or Module\n\

-including, but not limited to the following locations:\n\

-\n\

-       - The top-level (root) directory\n\

-       - Plug-in and Fragment directories\n\

-       - Inside Plug-ins and Fragments packaged as JARs\n\

-       - Sub-directories of the directory named "src" of certain Plug-ins\n\

-       - Feature directories\n\

-\n\

-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\

-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\

-Update License") during the installation process. If the Feature contains\n\

-Included Features, the Feature Update License should either provide you\n\

-with the terms and conditions governing the Included Features or inform\n\

-you where you can locate them. Feature Update Licenses may be found in\n\

-the "license" property of files named "feature.properties" found within a Feature.\n\

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\

-terms and conditions (or references to such terms and conditions) that\n\

-govern your use of the associated Content in that directory.\n\

-\n\

-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\

-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\

-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\

-\n\

-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\

-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\

-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\

-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\

-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\

-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\

-\n\

-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\

-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\

-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\

-govern that particular Content.\n\

-\n\

-\n\Use of Provisioning Technology\n\

-\n\

-The Eclipse Foundation makes available provisioning software, examples of which include,\n\

-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\

-the purpose of allowing users to install software, documentation, information and/or\n\

-other materials (collectively "Installable Software"). This capability is provided with\n\

-the intent of allowing such users to install, extend and update Eclipse-based products.\n\

-Information about packaging Installable Software is available at\n\

-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\

-\n\

-You may use Provisioning Technology to allow other parties to install Installable Software.\n\

-You shall be responsible for enabling the applicable license agreements relating to the\n\

-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\

-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\

-making it available in accordance with the Specification, you further acknowledge your\n\

-agreement to, and the acquisition of all necessary rights to permit the following:\n\

-\n\

-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\

-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\

-          extending or updating the functionality of an Eclipse-based product.\n\

-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\

-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\

-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\

-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\

-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\

-          with the Specification. Such Installable Software Agreement must inform the user of the\n\

-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\

-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\

-          indication of agreement by the user, the provisioning Technology will complete installation\n\

-          of the Installable Software.\n\

-\n\

-Cryptography\n\

-\n\

-Content may contain encryption software. The country in which you are\n\

-currently may have restrictions on the import, possession, and use,\n\

-and/or re-export to another country, of encryption software. BEFORE\n\

-using any encryption software, please check the country's laws,\n\

-regulations and policies concerning the import, possession, or use, and\n\

-re-export of encryption software, to see if this is permitted.\n\

-\n\

-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n

-########### end of license property ##########################################

+# "featureName" property - name of the feature

+featureName=RMF Core ReqIF 1.0 Thirdparty Feature (Incubation)

+

+# "providerName" property - name of the company that provides the feature

+providerName=Eclipse Modeling Project

+

+# "updateSiteName" property - label for the update site

+

+# "description" property - description of the feature

+description=This feature encapsulates all third party plugins required by the RMF ReqIF core

+

+# "copyright" property - text of the "Feature Update Copyright"

+

+

+

+

diff --git a/org.eclipse.rmf.reqif10.thirdparty.feature/feature.xml b/org.eclipse.rmf.reqif10.thirdparty.feature/feature.xml
index 709dc3f..4b3c368 100644
--- a/org.eclipse.rmf.reqif10.thirdparty.feature/feature.xml
+++ b/org.eclipse.rmf.reqif10.thirdparty.feature/feature.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.rmf.reqif10.thirdparty.feature"
-      label="RMF ReqIF 1.0 Thirdparty Feature (Incubation)"
-      version="0.9.0.qualifier"
-      provider-name="Eclipse Modeling Project">
+      label="%featureName"
+      version="0.10.0.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.1.qualifier">
 
    <description url="http://www.eclipse.org/rmf">
-      This feature encapsulates all third party plugins required by the RMF ReqIF core
+      %description
    </description>
 
    <copyright url="http://itemis.com/">
-      Copyright (c) 2013 itemis AG.
+      Copyright (c) 2013 itemis AG and others.
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License
 v1.0
diff --git a/org.eclipse.rmf.reqif10.thirdparty.feature/license.html b/org.eclipse.rmf.reqif10.thirdparty.feature/license.html
deleted file mode 100644
index 5ef6811..0000000
--- a/org.eclipse.rmf.reqif10.thirdparty.feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

diff --git a/org.eclipse.rmf.reqif10.thirdparty.feature/notice.html b/org.eclipse.rmf.reqif10.thirdparty.feature/notice.html
deleted file mode 100644
index 5ef6811..0000000
--- a/org.eclipse.rmf.reqif10.thirdparty.feature/notice.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

diff --git a/org.eclipse.rmf.reqif10.thirdparty.feature/pom.xml b/org.eclipse.rmf.reqif10.thirdparty.feature/pom.xml
index 171125d..aeb82d3 100644
--- a/org.eclipse.rmf.reqif10.thirdparty.feature/pom.xml
+++ b/org.eclipse.rmf.reqif10.thirdparty.feature/pom.xml
@@ -6,11 +6,30 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.reqif10.thirdparty.feature</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<packaging>eclipse-feature</packaging>

 	<groupId>org.eclipse.rmf.features</groupId>

+	<build>

+	<plugins>

+		<plugin>

+				<groupId>org.eclipse.tycho.extras</groupId>

+				<artifactId>tycho-source-feature-plugin</artifactId>

+				<version>${tycho.version}</version>

+				<executions>

+					<execution>

+						<id>source-feature</id>

+						<goals>

+							<goal>source-feature</goal>

+						</goals>

+						<configuration>

+							<skip>true</skip>

+						</configuration>

+					</execution>

+				</executions>

+			</plugin>

+	</plugins>

+	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.xhtml.edit/META-INF/MANIFEST.MF
index 1543d76..afc3437 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rmf.reqif10.xhtml.edit;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.rmf.reqif10.xhtml.provider.XhtmlEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/about.html b/org.eclipse.rmf.reqif10.xhtml.edit/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/about.html
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/build.properties b/org.eclipse.rmf.reqif10.xhtml.edit/build.properties
index dc0632b..a1e9beb 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/build.properties
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/build.properties
@@ -1,12 +1,13 @@
-# Copyright (c) 2012 itemis AG.
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
-# 
+#
 # Contributors:
-#     Mark Broerkens - initial API and implementation
-# 
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 
 bin.includes = .,\
                META-INF/,\
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/epl-v10.html b/org.eclipse.rmf.reqif10.xhtml.edit/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/DocumentRoot.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/DocumentRoot.gif
index 739ebbf..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/DocumentRoot.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/DocumentRoot.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlAType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlAType.gif
index 33854e9..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlAType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlAType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlAbbrType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlAbbrType.gif
index cb1755a..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlAbbrType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlAbbrType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlAcronymType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlAcronymType.gif
index 83afb9b..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlAcronymType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlAcronymType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlAddressType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlAddressType.gif
index 48e3cf2..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlAddressType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlAddressType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlBlockquoteType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlBlockquoteType.gif
index c4a8af4..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlBlockquoteType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlBlockquoteType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlBrType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlBrType.gif
index 7c2aaac..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlBrType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlBrType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlCaptionType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlCaptionType.gif
index 134551b..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlCaptionType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlCaptionType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlCiteType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlCiteType.gif
index 83afb9b..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlCiteType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlCiteType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlCodeType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlCodeType.gif
index 9041598..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlCodeType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlCodeType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlColType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlColType.gif
index 9041598..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlColType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlColType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlColgroupType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlColgroupType.gif
index 14af8aa..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlColgroupType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlColgroupType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDdType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDdType.gif
index 1e5345f..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDdType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDdType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDfnType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDfnType.gif
index b1f8afa..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDfnType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDfnType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDivType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDivType.gif
index 53500da..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDivType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDivType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDlType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDlType.gif
index 338fb8d..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDlType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDlType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDtType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDtType.gif
index 48e3cf2..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDtType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlDtType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlEditType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlEditType.gif
index f8041d2..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlEditType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlEditType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlEmType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlEmType.gif
index a26660e..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlEmType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlEmType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH1Type.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH1Type.gif
index ed87474..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH1Type.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH1Type.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH2Type.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH2Type.gif
index c4a8af4..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH2Type.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH2Type.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH3Type.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH3Type.gif
index 48e3cf2..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH3Type.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH3Type.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH4Type.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH4Type.gif
index 45731fe..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH4Type.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH4Type.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH5Type.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH5Type.gif
index 10d2229..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH5Type.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH5Type.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH6Type.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH6Type.gif
index b1f8afa..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH6Type.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlH6Type.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlHeadingType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlHeadingType.gif
index 5915591..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlHeadingType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlHeadingType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlHrType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlHrType.gif
index 10d2229..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlHrType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlHrType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlInlPresType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlInlPresType.gif
index 5a9bc75..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlInlPresType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlInlPresType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlKbdType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlKbdType.gif
index 7c2aaac..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlKbdType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlKbdType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlLiType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlLiType.gif
index 35ef84e..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlLiType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlLiType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlObjectType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlObjectType.gif
index caf2804..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlObjectType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlObjectType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlOlType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlOlType.gif
index b1f8afa..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlOlType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlOlType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlPType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlPType.gif
index 33a997a..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlPType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlPType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlParamType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlParamType.gif
index 98b351f..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlParamType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlParamType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlPreType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlPreType.gif
index 9250fec..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlPreType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlPreType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlQType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlQType.gif
index c00aedf..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlQType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlQType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlSampType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlSampType.gif
index 739ebbf..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlSampType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlSampType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlSpanType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlSpanType.gif
index 2b69256..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlSpanType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlSpanType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlStrongType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlStrongType.gif
index f8041d2..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlStrongType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlStrongType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTableType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTableType.gif
index c673a52..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTableType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTableType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTbodyType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTbodyType.gif
index c00aedf..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTbodyType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTbodyType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTdType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTdType.gif
index 48e3cf2..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTdType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTdType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTfootType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTfootType.gif
index 48e3cf2..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTfootType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTfootType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlThType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlThType.gif
index 420eee1..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlThType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlThType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTheadType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTheadType.gif
index d3dc5a9..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTheadType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTheadType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTrType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTrType.gif
index 53500da..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTrType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlTrType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlUlType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlUlType.gif
index 9041598..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlUlType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlUlType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlVarType.gif b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlVarType.gif
index f8041d2..b9d3a32 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlVarType.gif
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/icons/full/obj16/XhtmlVarType.gif
Binary files differ
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/notice.html b/org.eclipse.rmf.reqif10.xhtml.edit/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/notice.html
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/plugin.properties b/org.eclipse.rmf.reqif10.xhtml.edit/plugin.properties
index 8faf499..852826b 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/plugin.properties
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/plugin.properties
@@ -1,11 +1,13 @@
-# Copyright (c) 2012 itemis GmbH.
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # Contributors:
-#     Mark Broerkens - initial API and implementation
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 
 pluginName = RMF Core ReqIF Xhtml Edit (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/pom.xml b/org.eclipse.rmf.reqif10.xhtml.edit/pom.xml
index 631e462..109d024 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/pom.xml
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/pom.xml
@@ -19,31 +19,13 @@
 	<parent>
 		<groupId>org.eclipse.rmf</groupId>
 		<artifactId>org.eclipse.rmf.releng</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.10.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.rmf.reqif10.xhtml.edit</artifactId>
-	<version>0.9.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.rmf.plugins</groupId>
 	<properties>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   	</properties>
- 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>plugin-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/DocumentRootItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/DocumentRootItemProvider.java
index fd23df9..4b4622b 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/DocumentRootItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/DocumentRootItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -38,23 +37,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class DocumentRootItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class DocumentRootItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DocumentRootItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +54,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -80,77 +71,47 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DocumentRoot_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DocumentRoot_class_feature", "_UI_DocumentRoot_type"),
-				 XhtmlPackage.eINSTANCE.getDocumentRoot_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_DocumentRoot_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_DocumentRoot_class_feature", "_UI_DocumentRoot_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getDocumentRoot_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DocumentRoot_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DocumentRoot_id_feature", "_UI_DocumentRoot_type"),
-				 XhtmlPackage.eINSTANCE.getDocumentRoot_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_DocumentRoot_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_DocumentRoot_id_feature", "_UI_DocumentRoot_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getDocumentRoot_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DocumentRoot_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DocumentRoot_title_feature", "_UI_DocumentRoot_type"),
-				 XhtmlPackage.eINSTANCE.getDocumentRoot_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_DocumentRoot_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_DocumentRoot_title_feature", "_UI_DocumentRoot_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getDocumentRoot_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -164,8 +125,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -177,35 +138,32 @@
 	}
 
 	/**
-	 * This returns DocumentRoot.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns DocumentRoot.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DocumentRoot"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/DocumentRoot")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((DocumentRoot)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_DocumentRoot_type") :
-			getString("_UI_DocumentRoot_type") + " " + label;
+		String label = ((DocumentRoot) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_DocumentRoot_type") : //$NON-NLS-1$
+				getString("_UI_DocumentRoot_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -213,45 +171,37 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(DocumentRoot.class)) {
-			case XhtmlPackage.DOCUMENT_ROOT__CLASS:
-			case XhtmlPackage.DOCUMENT_ROOT__ID:
-			case XhtmlPackage.DOCUMENT_ROOT__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.DOCUMENT_ROOT__DIV:
-			case XhtmlPackage.DOCUMENT_ROOT__P:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.DOCUMENT_ROOT__CLASS:
+		case XhtmlPackage.DOCUMENT_ROOT__ID:
+		case XhtmlPackage.DOCUMENT_ROOT__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.DOCUMENT_ROOT__DIV:
+		case XhtmlPackage.DOCUMENT_ROOT__P:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getDocumentRoot_Div(),
-				 XhtmlFactory.eINSTANCE.createXhtmlDivType()));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getDocumentRoot_Div(), XhtmlFactory.eINSTANCE.createXhtmlDivType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getDocumentRoot_P(),
-				 XhtmlFactory.eINSTANCE.createXhtmlPType()));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getDocumentRoot_P(), XhtmlFactory.eINSTANCE.createXhtmlPType()));
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlATypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlATypeItemProvider.java
index bd027a3..b7109bf 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlATypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlATypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlATypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlATypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlATypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,319 +88,179 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Accesskey feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Accesskey feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAccesskeyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAType_accesskey_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_accesskey_feature", "_UI_XhtmlAType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAType_Accesskey(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAType_accesskey_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_accesskey_feature", "_UI_XhtmlAType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAType_Accesskey(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Charset feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Charset feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharsetPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAType_charset_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_charset_feature", "_UI_XhtmlAType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAType_Charset(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAType_charset_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_charset_feature", "_UI_XhtmlAType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAType_Charset(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_class_feature", "_UI_XhtmlAType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_class_feature", "_UI_XhtmlAType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Href feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Href feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addHrefPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAType_href_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_href_feature", "_UI_XhtmlAType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAType_Href(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAType_href_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_href_feature", "_UI_XhtmlAType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAType_Href(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Hreflang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Hreflang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addHreflangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAType_hreflang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_hreflang_feature", "_UI_XhtmlAType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAType_Hreflang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAType_hreflang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_hreflang_feature", "_UI_XhtmlAType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAType_Hreflang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_id_feature", "_UI_XhtmlAType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_id_feature", "_UI_XhtmlAType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_lang_feature", "_UI_XhtmlAType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_lang_feature", "_UI_XhtmlAType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Rel feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Rel feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addRelPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAType_rel_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_rel_feature", "_UI_XhtmlAType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAType_Rel(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAType_rel_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_rel_feature", "_UI_XhtmlAType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAType_Rel(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Rev feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Rev feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addRevPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAType_rev_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_rev_feature", "_UI_XhtmlAType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAType_Rev(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAType_rev_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_rev_feature", "_UI_XhtmlAType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAType_Rev(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_space_feature", "_UI_XhtmlAType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_space_feature", "_UI_XhtmlAType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_style_feature", "_UI_XhtmlAType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_style_feature", "_UI_XhtmlAType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Tabindex feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Tabindex feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTabindexPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAType_tabindex_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_tabindex_feature", "_UI_XhtmlAType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAType_Tabindex(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAType_tabindex_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_tabindex_feature", "_UI_XhtmlAType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAType_Tabindex(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_title_feature", "_UI_XhtmlAType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_title_feature", "_UI_XhtmlAType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAType_type_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_type_feature", "_UI_XhtmlAType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAType_Type(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAType_type_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAType_type_feature", "_UI_XhtmlAType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAType_Type(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -422,8 +273,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -435,35 +286,32 @@
 	}
 
 	/**
-	 * This returns XhtmlAType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlAType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlAType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlAType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlAType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlAType_type") :
-			getString("_UI_XhtmlAType_type") + " " + label;
+		String label = ((XhtmlAType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlAType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlAType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -471,234 +319,127 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlAType.class)) {
-			case XhtmlPackage.XHTML_ATYPE__ACCESSKEY:
-			case XhtmlPackage.XHTML_ATYPE__CHARSET:
-			case XhtmlPackage.XHTML_ATYPE__CLASS:
-			case XhtmlPackage.XHTML_ATYPE__HREF:
-			case XhtmlPackage.XHTML_ATYPE__HREFLANG:
-			case XhtmlPackage.XHTML_ATYPE__ID:
-			case XhtmlPackage.XHTML_ATYPE__LANG:
-			case XhtmlPackage.XHTML_ATYPE__REL:
-			case XhtmlPackage.XHTML_ATYPE__REV:
-			case XhtmlPackage.XHTML_ATYPE__SPACE:
-			case XhtmlPackage.XHTML_ATYPE__STYLE:
-			case XhtmlPackage.XHTML_ATYPE__TABINDEX:
-			case XhtmlPackage.XHTML_ATYPE__TITLE:
-			case XhtmlPackage.XHTML_ATYPE__TYPE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_ATYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_ATYPE__ACCESSKEY:
+		case XhtmlPackage.XHTML_ATYPE__CHARSET:
+		case XhtmlPackage.XHTML_ATYPE__CLASS:
+		case XhtmlPackage.XHTML_ATYPE__HREF:
+		case XhtmlPackage.XHTML_ATYPE__HREFLANG:
+		case XhtmlPackage.XHTML_ATYPE__ID:
+		case XhtmlPackage.XHTML_ATYPE__LANG:
+		case XhtmlPackage.XHTML_ATYPE__REL:
+		case XhtmlPackage.XHTML_ATYPE__REV:
+		case XhtmlPackage.XHTML_ATYPE__SPACE:
+		case XhtmlPackage.XHTML_ATYPE__STYLE:
+		case XhtmlPackage.XHTML_ATYPE__TABINDEX:
+		case XhtmlPackage.XHTML_ATYPE__TITLE:
+		case XhtmlPackage.XHTML_ATYPE__TYPE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_ATYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -706,35 +447,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlAbbrTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlAbbrTypeItemProvider.java
index c83ca73..bb34978 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlAbbrTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlAbbrTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlAbbrTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlAbbrTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlAbbrTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAbbrType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAbbrType_class_feature", "_UI_XhtmlAbbrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAbbrType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAbbrType_class_feature", "_UI_XhtmlAbbrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAbbrType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAbbrType_id_feature", "_UI_XhtmlAbbrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAbbrType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAbbrType_id_feature", "_UI_XhtmlAbbrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAbbrType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAbbrType_lang_feature", "_UI_XhtmlAbbrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAbbrType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAbbrType_lang_feature", "_UI_XhtmlAbbrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAbbrType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAbbrType_space_feature", "_UI_XhtmlAbbrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAbbrType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAbbrType_space_feature", "_UI_XhtmlAbbrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAbbrType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAbbrType_style_feature", "_UI_XhtmlAbbrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAbbrType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAbbrType_style_feature", "_UI_XhtmlAbbrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAbbrType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAbbrType_title_feature", "_UI_XhtmlAbbrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAbbrType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAbbrType_title_feature", "_UI_XhtmlAbbrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlAbbrType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlAbbrType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlAbbrType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlAbbrType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlAbbrType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlAbbrType_type") :
-			getString("_UI_XhtmlAbbrType_type") + " " + label;
+		String label = ((XhtmlAbbrType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlAbbrType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlAbbrType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlAbbrType.class)) {
-			case XhtmlPackage.XHTML_ABBR_TYPE__CLASS:
-			case XhtmlPackage.XHTML_ABBR_TYPE__ID:
-			case XhtmlPackage.XHTML_ABBR_TYPE__LANG:
-			case XhtmlPackage.XHTML_ABBR_TYPE__SPACE:
-			case XhtmlPackage.XHTML_ABBR_TYPE__STYLE:
-			case XhtmlPackage.XHTML_ABBR_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__CLASS:
+		case XhtmlPackage.XHTML_ABBR_TYPE__ID:
+		case XhtmlPackage.XHTML_ABBR_TYPE__LANG:
+		case XhtmlPackage.XHTML_ABBR_TYPE__SPACE:
+		case XhtmlPackage.XHTML_ABBR_TYPE__STYLE:
+		case XhtmlPackage.XHTML_ABBR_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAbbrType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlAcronymTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlAcronymTypeItemProvider.java
index e55b851..949db5d 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlAcronymTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlAcronymTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlAcronymTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlAcronymTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlAcronymTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAcronymType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAcronymType_class_feature", "_UI_XhtmlAcronymType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAcronymType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAcronymType_class_feature", "_UI_XhtmlAcronymType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAcronymType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAcronymType_id_feature", "_UI_XhtmlAcronymType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAcronymType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAcronymType_id_feature", "_UI_XhtmlAcronymType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAcronymType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAcronymType_lang_feature", "_UI_XhtmlAcronymType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAcronymType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAcronymType_lang_feature", "_UI_XhtmlAcronymType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAcronymType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAcronymType_space_feature", "_UI_XhtmlAcronymType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAcronymType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAcronymType_space_feature", "_UI_XhtmlAcronymType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAcronymType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAcronymType_style_feature", "_UI_XhtmlAcronymType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAcronymType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAcronymType_style_feature", "_UI_XhtmlAcronymType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAcronymType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAcronymType_title_feature", "_UI_XhtmlAcronymType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAcronymType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAcronymType_title_feature", "_UI_XhtmlAcronymType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlAcronymType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlAcronymType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlAcronymType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlAcronymType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlAcronymType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlAcronymType_type") :
-			getString("_UI_XhtmlAcronymType_type") + " " + label;
+		String label = ((XhtmlAcronymType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlAcronymType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlAcronymType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlAcronymType.class)) {
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__CLASS:
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__ID:
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__LANG:
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SPACE:
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__STYLE:
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__CLASS:
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__ID:
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__LANG:
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SPACE:
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__STYLE:
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,31 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Tt()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_I() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_B()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Small()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Sup()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAcronymType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlAddressTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlAddressTypeItemProvider.java
index f57c350..c4de37a 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlAddressTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlAddressTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlAddressTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlAddressTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlAddressTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAddressType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAddressType_class_feature", "_UI_XhtmlAddressType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAddressType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAddressType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAddressType_class_feature", "_UI_XhtmlAddressType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAddressType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAddressType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAddressType_id_feature", "_UI_XhtmlAddressType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAddressType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAddressType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAddressType_id_feature", "_UI_XhtmlAddressType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAddressType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAddressType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAddressType_lang_feature", "_UI_XhtmlAddressType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAddressType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAddressType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAddressType_lang_feature", "_UI_XhtmlAddressType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAddressType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAddressType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAddressType_space_feature", "_UI_XhtmlAddressType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAddressType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAddressType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAddressType_space_feature", "_UI_XhtmlAddressType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAddressType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAddressType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAddressType_style_feature", "_UI_XhtmlAddressType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAddressType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAddressType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAddressType_style_feature", "_UI_XhtmlAddressType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAddressType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlAddressType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAddressType_title_feature", "_UI_XhtmlAddressType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlAddressType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlAddressType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlAddressType_title_feature", "_UI_XhtmlAddressType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlAddressType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlAddressType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlAddressType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlAddressType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlAddressType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlAddressType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlAddressType_type") :
-			getString("_UI_XhtmlAddressType_type") + " " + label;
+		String label = ((XhtmlAddressType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlAddressType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlAddressType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlAddressType.class)) {
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__CLASS:
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__ID:
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__LANG:
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SPACE:
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__STYLE:
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__CLASS:
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__ID:
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__LANG:
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SPACE:
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__STYLE:
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlAddressType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,31 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_Tt()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_I() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_B()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_Small()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_Sup()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlAddressType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlBlockquoteTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlBlockquoteTypeItemProvider.java
index 955edfc..9c16211 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlBlockquoteTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlBlockquoteTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -41,23 +40,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlBlockquoteTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlBlockquoteTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlBlockquoteTypeItemProvider(AdapterFactory adapterFactory) {
@@ -65,9 +57,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,165 +78,95 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Cite feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Cite feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCitePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlBlockquoteType_cite_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBlockquoteType_cite_feature", "_UI_XhtmlBlockquoteType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Cite(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlBlockquoteType_cite_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBlockquoteType_cite_feature", "_UI_XhtmlBlockquoteType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Cite(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlBlockquoteType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBlockquoteType_class_feature", "_UI_XhtmlBlockquoteType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlBlockquoteType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBlockquoteType_class_feature", "_UI_XhtmlBlockquoteType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlBlockquoteType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBlockquoteType_id_feature", "_UI_XhtmlBlockquoteType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlBlockquoteType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBlockquoteType_id_feature", "_UI_XhtmlBlockquoteType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlBlockquoteType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBlockquoteType_lang_feature", "_UI_XhtmlBlockquoteType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlBlockquoteType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBlockquoteType_lang_feature", "_UI_XhtmlBlockquoteType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlBlockquoteType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBlockquoteType_space_feature", "_UI_XhtmlBlockquoteType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlBlockquoteType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBlockquoteType_space_feature", "_UI_XhtmlBlockquoteType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlBlockquoteType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBlockquoteType_style_feature", "_UI_XhtmlBlockquoteType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlBlockquoteType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBlockquoteType_style_feature", "_UI_XhtmlBlockquoteType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlBlockquoteType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBlockquoteType_title_feature", "_UI_XhtmlBlockquoteType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlBlockquoteType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBlockquoteType_title_feature", "_UI_XhtmlBlockquoteType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -258,8 +179,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -271,35 +192,32 @@
 	}
 
 	/**
-	 * This returns XhtmlBlockquoteType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlBlockquoteType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlBlockquoteType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlBlockquoteType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlBlockquoteType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlBlockquoteType_type") :
-			getString("_UI_XhtmlBlockquoteType_type") + " " + label;
+		String label = ((XhtmlBlockquoteType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlBlockquoteType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlBlockquoteType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -307,164 +225,96 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlBlockquoteType.class)) {
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CITE:
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CLASS:
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ID:
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__LANG:
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__SPACE:
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__STYLE:
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__XHTML_BLOCK_MIX:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CITE:
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CLASS:
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ID:
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__LANG:
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__SPACE:
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__STYLE:
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__XHTML_BLOCK_MIX:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_H1(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH1Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_H1(), XhtmlFactory.eINSTANCE.createXhtmlH1Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_H2(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH2Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_H2(), XhtmlFactory.eINSTANCE.createXhtmlH2Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_H3(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH3Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_H3(), XhtmlFactory.eINSTANCE.createXhtmlH3Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_H4(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH4Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_H4(), XhtmlFactory.eINSTANCE.createXhtmlH4Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_H5(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH5Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_H5(), XhtmlFactory.eINSTANCE.createXhtmlH5Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_H6(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH6Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_H6(), XhtmlFactory.eINSTANCE.createXhtmlH6Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Ul(),
-					 XhtmlFactory.eINSTANCE.createXhtmlUlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Ul(), XhtmlFactory.eINSTANCE.createXhtmlUlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Ol(),
-					 XhtmlFactory.eINSTANCE.createXhtmlOlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Ol(), XhtmlFactory.eINSTANCE.createXhtmlOlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Dl(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Dl(), XhtmlFactory.eINSTANCE.createXhtmlDlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_P(),
-					 XhtmlFactory.eINSTANCE.createXhtmlPType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_P(), XhtmlFactory.eINSTANCE.createXhtmlPType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Div(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDivType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Div(), XhtmlFactory.eINSTANCE.createXhtmlDivType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Pre(),
-					 XhtmlFactory.eINSTANCE.createXhtmlPreType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Pre(), XhtmlFactory.eINSTANCE.createXhtmlPreType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Blockquote(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBlockquoteType())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Blockquote(),
+						XhtmlFactory.eINSTANCE.createXhtmlBlockquoteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Address(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAddressType())));
+		newChildDescriptors
+				.add(createChildParameter(
+						XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+						FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Address(),
+								XhtmlFactory.eINSTANCE.createXhtmlAddressType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Hr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlHrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Hr(), XhtmlFactory.eINSTANCE.createXhtmlHrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Table(),
-					 XhtmlFactory.eINSTANCE.createXhtmlTableType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Table(), XhtmlFactory.eINSTANCE.createXhtmlTableType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_XhtmlBlockMix(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -472,28 +322,25 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlBrTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlBrTypeItemProvider.java
index de6b969..c70026f 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlBrTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlBrTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -35,23 +34,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlBrTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlBrTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlBrTypeItemProvider(AdapterFactory adapterFactory) {
@@ -59,9 +51,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -78,123 +69,80 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlBrType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBrType_class_feature", "_UI_XhtmlBrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlBrType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlBrType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBrType_class_feature", "_UI_XhtmlBrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlBrType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlBrType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBrType_id_feature", "_UI_XhtmlBrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlBrType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlBrType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBrType_id_feature", "_UI_XhtmlBrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlBrType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlBrType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBrType_space_feature", "_UI_XhtmlBrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlBrType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlBrType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBrType_space_feature", "_UI_XhtmlBrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlBrType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlBrType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBrType_title_feature", "_UI_XhtmlBrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlBrType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlBrType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlBrType_title_feature", "_UI_XhtmlBrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlBrType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This returns XhtmlBrType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlBrType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlBrType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlBrType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlBrType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlBrType_type") :
-			getString("_UI_XhtmlBrType_type") + " " + label;
+		String label = ((XhtmlBrType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlBrType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlBrType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -202,21 +150,20 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlBrType.class)) {
-			case XhtmlPackage.XHTML_BR_TYPE__CLASS:
-			case XhtmlPackage.XHTML_BR_TYPE__ID:
-			case XhtmlPackage.XHTML_BR_TYPE__SPACE:
-			case XhtmlPackage.XHTML_BR_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		case XhtmlPackage.XHTML_BR_TYPE__CLASS:
+		case XhtmlPackage.XHTML_BR_TYPE__ID:
+		case XhtmlPackage.XHTML_BR_TYPE__SPACE:
+		case XhtmlPackage.XHTML_BR_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -225,9 +172,8 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlCaptionTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlCaptionTypeItemProvider.java
index 4b8083f..d3fd82b 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlCaptionTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlCaptionTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlCaptionTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlCaptionTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlCaptionTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCaptionType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCaptionType_class_feature", "_UI_XhtmlCaptionType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCaptionType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCaptionType_class_feature", "_UI_XhtmlCaptionType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCaptionType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCaptionType_id_feature", "_UI_XhtmlCaptionType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCaptionType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCaptionType_id_feature", "_UI_XhtmlCaptionType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCaptionType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCaptionType_lang_feature", "_UI_XhtmlCaptionType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCaptionType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCaptionType_lang_feature", "_UI_XhtmlCaptionType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCaptionType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCaptionType_space_feature", "_UI_XhtmlCaptionType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCaptionType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCaptionType_space_feature", "_UI_XhtmlCaptionType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCaptionType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCaptionType_style_feature", "_UI_XhtmlCaptionType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCaptionType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCaptionType_style_feature", "_UI_XhtmlCaptionType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCaptionType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCaptionType_title_feature", "_UI_XhtmlCaptionType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCaptionType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCaptionType_title_feature", "_UI_XhtmlCaptionType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlCaptionType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlCaptionType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlCaptionType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlCaptionType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlCaptionType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlCaptionType_type") :
-			getString("_UI_XhtmlCaptionType_type") + " " + label;
+		String label = ((XhtmlCaptionType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlCaptionType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlCaptionType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlCaptionType.class)) {
-			case XhtmlPackage.XHTML_CAPTION_TYPE__CLASS:
-			case XhtmlPackage.XHTML_CAPTION_TYPE__ID:
-			case XhtmlPackage.XHTML_CAPTION_TYPE__LANG:
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SPACE:
-			case XhtmlPackage.XHTML_CAPTION_TYPE__STYLE:
-			case XhtmlPackage.XHTML_CAPTION_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__CLASS:
+		case XhtmlPackage.XHTML_CAPTION_TYPE__ID:
+		case XhtmlPackage.XHTML_CAPTION_TYPE__LANG:
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SPACE:
+		case XhtmlPackage.XHTML_CAPTION_TYPE__STYLE:
+		case XhtmlPackage.XHTML_CAPTION_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,31 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Tt()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_I() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_B()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Small()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Sup()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlCaptionType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlCiteTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlCiteTypeItemProvider.java
index 4aa7986..f957475 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlCiteTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlCiteTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlCiteTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlCiteTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlCiteTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCiteType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCiteType_class_feature", "_UI_XhtmlCiteType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCiteType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCiteType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCiteType_class_feature", "_UI_XhtmlCiteType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCiteType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCiteType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCiteType_id_feature", "_UI_XhtmlCiteType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCiteType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCiteType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCiteType_id_feature", "_UI_XhtmlCiteType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCiteType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCiteType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCiteType_lang_feature", "_UI_XhtmlCiteType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCiteType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCiteType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCiteType_lang_feature", "_UI_XhtmlCiteType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCiteType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCiteType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCiteType_space_feature", "_UI_XhtmlCiteType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCiteType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCiteType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCiteType_space_feature", "_UI_XhtmlCiteType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCiteType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCiteType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCiteType_style_feature", "_UI_XhtmlCiteType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCiteType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCiteType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCiteType_style_feature", "_UI_XhtmlCiteType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCiteType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCiteType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCiteType_title_feature", "_UI_XhtmlCiteType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCiteType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCiteType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCiteType_title_feature", "_UI_XhtmlCiteType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCiteType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlCiteType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlCiteType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlCiteType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlCiteType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlCiteType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlCiteType_type") :
-			getString("_UI_XhtmlCiteType_type") + " " + label;
+		String label = ((XhtmlCiteType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlCiteType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlCiteType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlCiteType.class)) {
-			case XhtmlPackage.XHTML_CITE_TYPE__CLASS:
-			case XhtmlPackage.XHTML_CITE_TYPE__ID:
-			case XhtmlPackage.XHTML_CITE_TYPE__LANG:
-			case XhtmlPackage.XHTML_CITE_TYPE__SPACE:
-			case XhtmlPackage.XHTML_CITE_TYPE__STYLE:
-			case XhtmlPackage.XHTML_CITE_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_CITE_TYPE__CLASS:
+		case XhtmlPackage.XHTML_CITE_TYPE__ID:
+		case XhtmlPackage.XHTML_CITE_TYPE__LANG:
+		case XhtmlPackage.XHTML_CITE_TYPE__SPACE:
+		case XhtmlPackage.XHTML_CITE_TYPE__STYLE:
+		case XhtmlPackage.XHTML_CITE_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCiteType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlCiteType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlCodeTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlCodeTypeItemProvider.java
index f6c37e6..c005964 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlCodeTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlCodeTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlCodeTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlCodeTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlCodeTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCodeType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCodeType_class_feature", "_UI_XhtmlCodeType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCodeType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCodeType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCodeType_class_feature", "_UI_XhtmlCodeType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCodeType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCodeType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCodeType_id_feature", "_UI_XhtmlCodeType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCodeType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCodeType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCodeType_id_feature", "_UI_XhtmlCodeType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCodeType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCodeType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCodeType_lang_feature", "_UI_XhtmlCodeType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCodeType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCodeType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCodeType_lang_feature", "_UI_XhtmlCodeType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCodeType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCodeType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCodeType_space_feature", "_UI_XhtmlCodeType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCodeType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCodeType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCodeType_space_feature", "_UI_XhtmlCodeType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCodeType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCodeType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCodeType_style_feature", "_UI_XhtmlCodeType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCodeType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCodeType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCodeType_style_feature", "_UI_XhtmlCodeType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCodeType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlCodeType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCodeType_title_feature", "_UI_XhtmlCodeType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlCodeType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlCodeType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlCodeType_title_feature", "_UI_XhtmlCodeType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlCodeType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlCodeType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlCodeType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlCodeType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlCodeType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlCodeType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlCodeType_type") :
-			getString("_UI_XhtmlCodeType_type") + " " + label;
+		String label = ((XhtmlCodeType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlCodeType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlCodeType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlCodeType.class)) {
-			case XhtmlPackage.XHTML_CODE_TYPE__CLASS:
-			case XhtmlPackage.XHTML_CODE_TYPE__ID:
-			case XhtmlPackage.XHTML_CODE_TYPE__LANG:
-			case XhtmlPackage.XHTML_CODE_TYPE__SPACE:
-			case XhtmlPackage.XHTML_CODE_TYPE__STYLE:
-			case XhtmlPackage.XHTML_CODE_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_CODE_TYPE__CLASS:
+		case XhtmlPackage.XHTML_CODE_TYPE__ID:
+		case XhtmlPackage.XHTML_CODE_TYPE__LANG:
+		case XhtmlPackage.XHTML_CODE_TYPE__SPACE:
+		case XhtmlPackage.XHTML_CODE_TYPE__STYLE:
+		case XhtmlPackage.XHTML_CODE_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlCodeType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlCodeType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlColTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlColTypeItemProvider.java
index d584c76..f454513 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlColTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlColTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -35,23 +34,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlColTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlColTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlColTypeItemProvider(AdapterFactory adapterFactory) {
@@ -59,9 +51,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -86,299 +77,176 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Align feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Align feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAlignPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColType_align_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_align_feature", "_UI_XhtmlColType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColType_Align(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColType_align_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_align_feature", "_UI_XhtmlColType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColType_Align(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Char feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Char feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColType_char_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_char_feature", "_UI_XhtmlColType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColType_Char(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColType_char_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_char_feature", "_UI_XhtmlColType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColType_Char(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Charoff feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Charoff feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharoffPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColType_charoff_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_charoff_feature", "_UI_XhtmlColType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColType_Charoff(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColType_charoff_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_charoff_feature", "_UI_XhtmlColType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColType_Charoff(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_class_feature", "_UI_XhtmlColType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_class_feature", "_UI_XhtmlColType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_id_feature", "_UI_XhtmlColType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_id_feature", "_UI_XhtmlColType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_lang_feature", "_UI_XhtmlColType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_lang_feature", "_UI_XhtmlColType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_space_feature", "_UI_XhtmlColType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_space_feature", "_UI_XhtmlColType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Span feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Span feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpanPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColType_span_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_span_feature", "_UI_XhtmlColType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColType_Span(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColType_span_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_span_feature", "_UI_XhtmlColType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColType_Span(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_style_feature", "_UI_XhtmlColType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_style_feature", "_UI_XhtmlColType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_title_feature", "_UI_XhtmlColType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_title_feature", "_UI_XhtmlColType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Valign feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Valign feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addValignPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColType_valign_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_valign_feature", "_UI_XhtmlColType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColType_Valign(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColType_valign_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_valign_feature", "_UI_XhtmlColType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColType_Valign(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Width feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Width feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColType_width_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_width_feature", "_UI_XhtmlColType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColType_Width(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColType_width_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColType_width_feature", "_UI_XhtmlColType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColType_Width(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This returns XhtmlColType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlColType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlColType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlColType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlColType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlColType_type") :
-			getString("_UI_XhtmlColType_type") + " " + label;
+		String label = ((XhtmlColType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlColType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlColType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -386,29 +254,28 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlColType.class)) {
-			case XhtmlPackage.XHTML_COL_TYPE__ALIGN:
-			case XhtmlPackage.XHTML_COL_TYPE__CHAR:
-			case XhtmlPackage.XHTML_COL_TYPE__CHAROFF:
-			case XhtmlPackage.XHTML_COL_TYPE__CLASS:
-			case XhtmlPackage.XHTML_COL_TYPE__ID:
-			case XhtmlPackage.XHTML_COL_TYPE__LANG:
-			case XhtmlPackage.XHTML_COL_TYPE__SPACE:
-			case XhtmlPackage.XHTML_COL_TYPE__SPAN:
-			case XhtmlPackage.XHTML_COL_TYPE__STYLE:
-			case XhtmlPackage.XHTML_COL_TYPE__TITLE:
-			case XhtmlPackage.XHTML_COL_TYPE__VALIGN:
-			case XhtmlPackage.XHTML_COL_TYPE__WIDTH:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		case XhtmlPackage.XHTML_COL_TYPE__ALIGN:
+		case XhtmlPackage.XHTML_COL_TYPE__CHAR:
+		case XhtmlPackage.XHTML_COL_TYPE__CHAROFF:
+		case XhtmlPackage.XHTML_COL_TYPE__CLASS:
+		case XhtmlPackage.XHTML_COL_TYPE__ID:
+		case XhtmlPackage.XHTML_COL_TYPE__LANG:
+		case XhtmlPackage.XHTML_COL_TYPE__SPACE:
+		case XhtmlPackage.XHTML_COL_TYPE__SPAN:
+		case XhtmlPackage.XHTML_COL_TYPE__STYLE:
+		case XhtmlPackage.XHTML_COL_TYPE__TITLE:
+		case XhtmlPackage.XHTML_COL_TYPE__VALIGN:
+		case XhtmlPackage.XHTML_COL_TYPE__WIDTH:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -417,9 +284,8 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlColgroupTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlColgroupTypeItemProvider.java
index 6fa3e9a..f29fc87 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlColgroupTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlColgroupTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -38,23 +37,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlColgroupTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlColgroupTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlColgroupTypeItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +54,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,275 +80,155 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Align feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Align feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAlignPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColgroupType_align_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_align_feature", "_UI_XhtmlColgroupType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Align(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColgroupType_align_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_align_feature", "_UI_XhtmlColgroupType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Align(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Char feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Char feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColgroupType_char_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_char_feature", "_UI_XhtmlColgroupType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Char(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColgroupType_char_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_char_feature", "_UI_XhtmlColgroupType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Char(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Charoff feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Charoff feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharoffPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColgroupType_charoff_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_charoff_feature", "_UI_XhtmlColgroupType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Charoff(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColgroupType_charoff_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_charoff_feature", "_UI_XhtmlColgroupType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Charoff(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColgroupType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_class_feature", "_UI_XhtmlColgroupType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColgroupType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_class_feature", "_UI_XhtmlColgroupType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColgroupType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_id_feature", "_UI_XhtmlColgroupType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColgroupType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_id_feature", "_UI_XhtmlColgroupType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColgroupType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_lang_feature", "_UI_XhtmlColgroupType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColgroupType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_lang_feature", "_UI_XhtmlColgroupType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColgroupType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_space_feature", "_UI_XhtmlColgroupType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColgroupType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_space_feature", "_UI_XhtmlColgroupType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Span feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Span feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpanPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColgroupType_span_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_span_feature", "_UI_XhtmlColgroupType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Span(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColgroupType_span_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_span_feature", "_UI_XhtmlColgroupType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Span(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColgroupType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_style_feature", "_UI_XhtmlColgroupType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColgroupType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_style_feature", "_UI_XhtmlColgroupType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColgroupType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_title_feature", "_UI_XhtmlColgroupType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColgroupType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_title_feature", "_UI_XhtmlColgroupType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Valign feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Valign feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addValignPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColgroupType_valign_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_valign_feature", "_UI_XhtmlColgroupType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Valign(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColgroupType_valign_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_valign_feature", "_UI_XhtmlColgroupType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Valign(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Width feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Width feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlColgroupType_width_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_width_feature", "_UI_XhtmlColgroupType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Width(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlColgroupType_width_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlColgroupType_width_feature", "_UI_XhtmlColgroupType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Width(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -370,8 +241,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -383,35 +254,32 @@
 	}
 
 	/**
-	 * This returns XhtmlColgroupType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlColgroupType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlColgroupType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlColgroupType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlColgroupType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlColgroupType_type") :
-			getString("_UI_XhtmlColgroupType_type") + " " + label;
+		String label = ((XhtmlColgroupType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlColgroupType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlColgroupType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -419,48 +287,43 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlColgroupType.class)) {
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__ALIGN:
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAR:
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAROFF:
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__CLASS:
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__ID:
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__LANG:
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__SPACE:
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__SPAN:
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__STYLE:
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__TITLE:
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__VALIGN:
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__WIDTH:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__COL:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__ALIGN:
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAR:
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAROFF:
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__CLASS:
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__ID:
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__LANG:
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__SPACE:
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__SPAN:
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__STYLE:
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__TITLE:
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__VALIGN:
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__WIDTH:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__COL:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Col(),
-				 XhtmlFactory.eINSTANCE.createXhtmlColType()));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlColgroupType_Col(), XhtmlFactory.eINSTANCE.createXhtmlColType()));
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDdTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDdTypeItemProvider.java
index ffe3058..4d5e8f9 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDdTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDdTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlDdTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlDdTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlDdTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDdType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDdType_class_feature", "_UI_XhtmlDdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDdType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDdType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDdType_class_feature", "_UI_XhtmlDdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDdType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDdType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDdType_id_feature", "_UI_XhtmlDdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDdType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDdType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDdType_id_feature", "_UI_XhtmlDdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDdType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDdType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDdType_lang_feature", "_UI_XhtmlDdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDdType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDdType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDdType_lang_feature", "_UI_XhtmlDdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDdType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDdType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDdType_space_feature", "_UI_XhtmlDdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDdType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDdType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDdType_space_feature", "_UI_XhtmlDdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDdType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDdType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDdType_style_feature", "_UI_XhtmlDdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDdType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDdType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDdType_style_feature", "_UI_XhtmlDdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDdType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDdType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDdType_title_feature", "_UI_XhtmlDdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDdType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDdType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDdType_title_feature", "_UI_XhtmlDdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDdType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlDdType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlDdType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlDdType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlDdType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlDdType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlDdType_type") :
-			getString("_UI_XhtmlDdType_type") + " " + label;
+		String label = ((XhtmlDdType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlDdType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlDdType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,345 +215,170 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlDdType.class)) {
-			case XhtmlPackage.XHTML_DD_TYPE__CLASS:
-			case XhtmlPackage.XHTML_DD_TYPE__ID:
-			case XhtmlPackage.XHTML_DD_TYPE__LANG:
-			case XhtmlPackage.XHTML_DD_TYPE__SPACE:
-			case XhtmlPackage.XHTML_DD_TYPE__STYLE:
-			case XhtmlPackage.XHTML_DD_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_DD_TYPE__CLASS:
+		case XhtmlPackage.XHTML_DD_TYPE__ID:
+		case XhtmlPackage.XHTML_DD_TYPE__LANG:
+		case XhtmlPackage.XHTML_DD_TYPE__SPACE:
+		case XhtmlPackage.XHTML_DD_TYPE__STYLE:
+		case XhtmlPackage.XHTML_DD_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_H1(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH1Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_H1(), XhtmlFactory.eINSTANCE.createXhtmlH1Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_H2(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH2Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_H2(), XhtmlFactory.eINSTANCE.createXhtmlH2Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_H3(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH3Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_H3(), XhtmlFactory.eINSTANCE.createXhtmlH3Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_H4(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH4Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_H4(), XhtmlFactory.eINSTANCE.createXhtmlH4Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_H5(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH5Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_H5(), XhtmlFactory.eINSTANCE.createXhtmlH5Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_H6(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH6Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_H6(), XhtmlFactory.eINSTANCE.createXhtmlH6Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Ul(),
-					 XhtmlFactory.eINSTANCE.createXhtmlUlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Ul(), XhtmlFactory.eINSTANCE.createXhtmlUlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Ol(),
-					 XhtmlFactory.eINSTANCE.createXhtmlOlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Ol(), XhtmlFactory.eINSTANCE.createXhtmlOlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Dl(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Dl(), XhtmlFactory.eINSTANCE.createXhtmlDlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_P(),
-					 XhtmlFactory.eINSTANCE.createXhtmlPType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_P(), XhtmlFactory.eINSTANCE.createXhtmlPType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Div(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDivType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Div(), XhtmlFactory.eINSTANCE.createXhtmlDivType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Pre(),
-					 XhtmlFactory.eINSTANCE.createXhtmlPreType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Pre(), XhtmlFactory.eINSTANCE.createXhtmlPreType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Blockquote(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBlockquoteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Blockquote(), XhtmlFactory.eINSTANCE.createXhtmlBlockquoteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Address(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAddressType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Address(), XhtmlFactory.eINSTANCE.createXhtmlAddressType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Hr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlHrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Hr(), XhtmlFactory.eINSTANCE.createXhtmlHrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Table(),
-					 XhtmlFactory.eINSTANCE.createXhtmlTableType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Table(), XhtmlFactory.eINSTANCE.createXhtmlTableType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDdType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDdType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -633,35 +386,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlDdType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDfnTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDfnTypeItemProvider.java
index 080b5a6..c97f255 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDfnTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDfnTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlDfnTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlDfnTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlDfnTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDfnType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDfnType_class_feature", "_UI_XhtmlDfnType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDfnType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDfnType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDfnType_class_feature", "_UI_XhtmlDfnType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDfnType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDfnType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDfnType_id_feature", "_UI_XhtmlDfnType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDfnType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDfnType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDfnType_id_feature", "_UI_XhtmlDfnType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDfnType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDfnType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDfnType_lang_feature", "_UI_XhtmlDfnType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDfnType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDfnType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDfnType_lang_feature", "_UI_XhtmlDfnType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDfnType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDfnType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDfnType_space_feature", "_UI_XhtmlDfnType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDfnType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDfnType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDfnType_space_feature", "_UI_XhtmlDfnType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDfnType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDfnType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDfnType_style_feature", "_UI_XhtmlDfnType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDfnType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDfnType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDfnType_style_feature", "_UI_XhtmlDfnType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDfnType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDfnType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDfnType_title_feature", "_UI_XhtmlDfnType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDfnType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDfnType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDfnType_title_feature", "_UI_XhtmlDfnType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDfnType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlDfnType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlDfnType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlDfnType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlDfnType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlDfnType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlDfnType_type") :
-			getString("_UI_XhtmlDfnType_type") + " " + label;
+		String label = ((XhtmlDfnType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlDfnType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlDfnType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlDfnType.class)) {
-			case XhtmlPackage.XHTML_DFN_TYPE__CLASS:
-			case XhtmlPackage.XHTML_DFN_TYPE__ID:
-			case XhtmlPackage.XHTML_DFN_TYPE__LANG:
-			case XhtmlPackage.XHTML_DFN_TYPE__SPACE:
-			case XhtmlPackage.XHTML_DFN_TYPE__STYLE:
-			case XhtmlPackage.XHTML_DFN_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_DFN_TYPE__CLASS:
+		case XhtmlPackage.XHTML_DFN_TYPE__ID:
+		case XhtmlPackage.XHTML_DFN_TYPE__LANG:
+		case XhtmlPackage.XHTML_DFN_TYPE__SPACE:
+		case XhtmlPackage.XHTML_DFN_TYPE__STYLE:
+		case XhtmlPackage.XHTML_DFN_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDfnType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlDfnType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDivTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDivTypeItemProvider.java
index bef3656..c451309 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDivTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDivTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlDivTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlDivTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlDivTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDivType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDivType_class_feature", "_UI_XhtmlDivType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDivType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDivType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDivType_class_feature", "_UI_XhtmlDivType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDivType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDivType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDivType_id_feature", "_UI_XhtmlDivType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDivType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDivType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDivType_id_feature", "_UI_XhtmlDivType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDivType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDivType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDivType_lang_feature", "_UI_XhtmlDivType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDivType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDivType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDivType_lang_feature", "_UI_XhtmlDivType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDivType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDivType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDivType_space_feature", "_UI_XhtmlDivType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDivType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDivType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDivType_space_feature", "_UI_XhtmlDivType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDivType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDivType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDivType_style_feature", "_UI_XhtmlDivType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDivType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDivType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDivType_style_feature", "_UI_XhtmlDivType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDivType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDivType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDivType_title_feature", "_UI_XhtmlDivType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDivType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDivType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDivType_title_feature", "_UI_XhtmlDivType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDivType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlDivType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlDivType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlDivType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlDivType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlDivType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlDivType_type") :
-			getString("_UI_XhtmlDivType_type") + " " + label;
+		String label = ((XhtmlDivType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlDivType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlDivType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,345 +215,170 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlDivType.class)) {
-			case XhtmlPackage.XHTML_DIV_TYPE__CLASS:
-			case XhtmlPackage.XHTML_DIV_TYPE__ID:
-			case XhtmlPackage.XHTML_DIV_TYPE__LANG:
-			case XhtmlPackage.XHTML_DIV_TYPE__SPACE:
-			case XhtmlPackage.XHTML_DIV_TYPE__STYLE:
-			case XhtmlPackage.XHTML_DIV_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_DIV_TYPE__CLASS:
+		case XhtmlPackage.XHTML_DIV_TYPE__ID:
+		case XhtmlPackage.XHTML_DIV_TYPE__LANG:
+		case XhtmlPackage.XHTML_DIV_TYPE__SPACE:
+		case XhtmlPackage.XHTML_DIV_TYPE__STYLE:
+		case XhtmlPackage.XHTML_DIV_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_H1(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH1Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_H1(), XhtmlFactory.eINSTANCE.createXhtmlH1Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_H2(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH2Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_H2(), XhtmlFactory.eINSTANCE.createXhtmlH2Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_H3(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH3Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_H3(), XhtmlFactory.eINSTANCE.createXhtmlH3Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_H4(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH4Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_H4(), XhtmlFactory.eINSTANCE.createXhtmlH4Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_H5(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH5Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_H5(), XhtmlFactory.eINSTANCE.createXhtmlH5Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_H6(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH6Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_H6(), XhtmlFactory.eINSTANCE.createXhtmlH6Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Ul(),
-					 XhtmlFactory.eINSTANCE.createXhtmlUlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Ul(), XhtmlFactory.eINSTANCE.createXhtmlUlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Ol(),
-					 XhtmlFactory.eINSTANCE.createXhtmlOlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Ol(), XhtmlFactory.eINSTANCE.createXhtmlOlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Dl(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Dl(), XhtmlFactory.eINSTANCE.createXhtmlDlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_P(),
-					 XhtmlFactory.eINSTANCE.createXhtmlPType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_P(), XhtmlFactory.eINSTANCE.createXhtmlPType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Div(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDivType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Div(), XhtmlFactory.eINSTANCE.createXhtmlDivType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Pre(),
-					 XhtmlFactory.eINSTANCE.createXhtmlPreType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Pre(), XhtmlFactory.eINSTANCE.createXhtmlPreType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Blockquote(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBlockquoteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Blockquote(), XhtmlFactory.eINSTANCE.createXhtmlBlockquoteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Address(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAddressType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Address(), XhtmlFactory.eINSTANCE.createXhtmlAddressType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Hr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlHrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Hr(), XhtmlFactory.eINSTANCE.createXhtmlHrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(),
-					 XhtmlFactory.eINSTANCE.createXhtmlTableType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), XhtmlFactory.eINSTANCE.createXhtmlTableType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDivType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDivType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDivType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -633,35 +386,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlDivType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDlTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDlTypeItemProvider.java
index a37cdc8..009b526 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDlTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDlTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -40,23 +39,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlDlTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlDlTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlDlTypeItemProvider(AdapterFactory adapterFactory) {
@@ -64,9 +56,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -85,143 +76,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDlType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDlType_class_feature", "_UI_XhtmlDlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDlType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDlType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDlType_class_feature", "_UI_XhtmlDlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDlType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDlType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDlType_id_feature", "_UI_XhtmlDlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDlType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDlType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDlType_id_feature", "_UI_XhtmlDlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDlType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDlType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDlType_lang_feature", "_UI_XhtmlDlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDlType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDlType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDlType_lang_feature", "_UI_XhtmlDlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDlType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDlType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDlType_space_feature", "_UI_XhtmlDlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDlType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDlType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDlType_space_feature", "_UI_XhtmlDlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDlType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDlType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDlType_style_feature", "_UI_XhtmlDlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDlType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDlType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDlType_style_feature", "_UI_XhtmlDlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDlType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDlType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDlType_title_feature", "_UI_XhtmlDlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDlType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDlType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDlType_title_feature", "_UI_XhtmlDlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDlType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -234,8 +165,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -247,35 +178,32 @@
 	}
 
 	/**
-	 * This returns XhtmlDlType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlDlType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlDlType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlDlType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlDlType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlDlType_type") :
-			getString("_UI_XhtmlDlType_type") + " " + label;
+		String label = ((XhtmlDlType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlDlType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlDlType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -283,51 +211,41 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlDlType.class)) {
-			case XhtmlPackage.XHTML_DL_TYPE__CLASS:
-			case XhtmlPackage.XHTML_DL_TYPE__ID:
-			case XhtmlPackage.XHTML_DL_TYPE__LANG:
-			case XhtmlPackage.XHTML_DL_TYPE__SPACE:
-			case XhtmlPackage.XHTML_DL_TYPE__STYLE:
-			case XhtmlPackage.XHTML_DL_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__GROUP:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_DL_TYPE__CLASS:
+		case XhtmlPackage.XHTML_DL_TYPE__ID:
+		case XhtmlPackage.XHTML_DL_TYPE__LANG:
+		case XhtmlPackage.XHTML_DL_TYPE__SPACE:
+		case XhtmlPackage.XHTML_DL_TYPE__STYLE:
+		case XhtmlPackage.XHTML_DL_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__GROUP:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDlType_Group(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDlType_Dt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDtType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDlType_Group(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDlType_Dt(), XhtmlFactory.eINSTANCE.createXhtmlDtType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDlType_Group(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDlType_Dd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDlType_Group(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDlType_Dd(), XhtmlFactory.eINSTANCE.createXhtmlDdType())));
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDtTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDtTypeItemProvider.java
index d32ecfc..ba73983 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDtTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlDtTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlDtTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlDtTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlDtTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDtType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDtType_class_feature", "_UI_XhtmlDtType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDtType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDtType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDtType_class_feature", "_UI_XhtmlDtType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDtType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDtType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDtType_id_feature", "_UI_XhtmlDtType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDtType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDtType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDtType_id_feature", "_UI_XhtmlDtType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDtType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDtType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDtType_lang_feature", "_UI_XhtmlDtType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDtType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDtType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDtType_lang_feature", "_UI_XhtmlDtType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDtType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDtType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDtType_space_feature", "_UI_XhtmlDtType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDtType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDtType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDtType_space_feature", "_UI_XhtmlDtType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDtType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDtType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDtType_style_feature", "_UI_XhtmlDtType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDtType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDtType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDtType_style_feature", "_UI_XhtmlDtType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDtType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlDtType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDtType_title_feature", "_UI_XhtmlDtType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlDtType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlDtType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlDtType_title_feature", "_UI_XhtmlDtType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlDtType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlDtType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlDtType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlDtType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlDtType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlDtType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlDtType_type") :
-			getString("_UI_XhtmlDtType_type") + " " + label;
+		String label = ((XhtmlDtType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlDtType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlDtType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlDtType.class)) {
-			case XhtmlPackage.XHTML_DT_TYPE__CLASS:
-			case XhtmlPackage.XHTML_DT_TYPE__ID:
-			case XhtmlPackage.XHTML_DT_TYPE__LANG:
-			case XhtmlPackage.XHTML_DT_TYPE__SPACE:
-			case XhtmlPackage.XHTML_DT_TYPE__STYLE:
-			case XhtmlPackage.XHTML_DT_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_DT_TYPE__CLASS:
+		case XhtmlPackage.XHTML_DT_TYPE__ID:
+		case XhtmlPackage.XHTML_DT_TYPE__LANG:
+		case XhtmlPackage.XHTML_DT_TYPE__SPACE:
+		case XhtmlPackage.XHTML_DT_TYPE__STYLE:
+		case XhtmlPackage.XHTML_DT_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlDtType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlDtType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlDtType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlDtType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlEditPlugin.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlEditPlugin.java
index 9862287..cfd2f34 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlEditPlugin.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlEditPlugin.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,44 +16,37 @@
 import org.eclipse.emf.common.util.ResourceLocator;
 
 /**
- * This is the central singleton for the Xhtml edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the central singleton for the Xhtml edit plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public final class XhtmlEditPlugin extends EMFPlugin {
 	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final XhtmlEditPlugin INSTANCE = new XhtmlEditPlugin();
 
 	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static Implementation plugin;
 
 	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlEditPlugin() {
-		super
-		  (new ResourceLocator [] {
-		   });
+		super(new ResourceLocator[] {});
 	}
 
 	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -63,9 +56,8 @@
 	}
 
 	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -74,16 +66,14 @@
 	}
 
 	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The actual implementation of the Eclipse <b>Plugin</b>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static class Implementation extends EclipsePlugin {
 		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		public Implementation() {
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlEditTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlEditTypeItemProvider.java
index 27fed41..aad2ffd 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlEditTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlEditTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlEditTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlEditTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlEditTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -91,187 +82,107 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Cite1 feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Cite1 feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCite1PropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlEditType_cite1_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEditType_cite1_feature", "_UI_XhtmlEditType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlEditType_Cite1(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlEditType_cite1_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEditType_cite1_feature", "_UI_XhtmlEditType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlEditType_Cite1(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlEditType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEditType_class_feature", "_UI_XhtmlEditType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlEditType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlEditType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEditType_class_feature", "_UI_XhtmlEditType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlEditType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Datetime feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Datetime feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDatetimePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlEditType_datetime_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEditType_datetime_feature", "_UI_XhtmlEditType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlEditType_Datetime(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlEditType_datetime_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEditType_datetime_feature", "_UI_XhtmlEditType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlEditType_Datetime(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlEditType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEditType_id_feature", "_UI_XhtmlEditType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlEditType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlEditType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEditType_id_feature", "_UI_XhtmlEditType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlEditType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlEditType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEditType_lang_feature", "_UI_XhtmlEditType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlEditType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlEditType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEditType_lang_feature", "_UI_XhtmlEditType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlEditType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlEditType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEditType_space_feature", "_UI_XhtmlEditType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlEditType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlEditType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEditType_space_feature", "_UI_XhtmlEditType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlEditType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlEditType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEditType_style_feature", "_UI_XhtmlEditType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlEditType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlEditType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEditType_style_feature", "_UI_XhtmlEditType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlEditType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlEditType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEditType_title_feature", "_UI_XhtmlEditType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlEditType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlEditType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEditType_title_feature", "_UI_XhtmlEditType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlEditType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -284,8 +195,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -297,35 +208,32 @@
 	}
 
 	/**
-	 * This returns XhtmlEditType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlEditType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlEditType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlEditType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlEditType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlEditType_type") :
-			getString("_UI_XhtmlEditType_type") + " " + label;
+		String label = ((XhtmlEditType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlEditType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlEditType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -333,347 +241,175 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlEditType.class)) {
-			case XhtmlPackage.XHTML_EDIT_TYPE__CITE1:
-			case XhtmlPackage.XHTML_EDIT_TYPE__CLASS:
-			case XhtmlPackage.XHTML_EDIT_TYPE__DATETIME:
-			case XhtmlPackage.XHTML_EDIT_TYPE__ID:
-			case XhtmlPackage.XHTML_EDIT_TYPE__LANG:
-			case XhtmlPackage.XHTML_EDIT_TYPE__SPACE:
-			case XhtmlPackage.XHTML_EDIT_TYPE__STYLE:
-			case XhtmlPackage.XHTML_EDIT_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__CITE1:
+		case XhtmlPackage.XHTML_EDIT_TYPE__CLASS:
+		case XhtmlPackage.XHTML_EDIT_TYPE__DATETIME:
+		case XhtmlPackage.XHTML_EDIT_TYPE__ID:
+		case XhtmlPackage.XHTML_EDIT_TYPE__LANG:
+		case XhtmlPackage.XHTML_EDIT_TYPE__SPACE:
+		case XhtmlPackage.XHTML_EDIT_TYPE__STYLE:
+		case XhtmlPackage.XHTML_EDIT_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_H1(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH1Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_H1(), XhtmlFactory.eINSTANCE.createXhtmlH1Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_H2(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH2Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_H2(), XhtmlFactory.eINSTANCE.createXhtmlH2Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_H3(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH3Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_H3(), XhtmlFactory.eINSTANCE.createXhtmlH3Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_H4(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH4Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_H4(), XhtmlFactory.eINSTANCE.createXhtmlH4Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_H5(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH5Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_H5(), XhtmlFactory.eINSTANCE.createXhtmlH5Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_H6(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH6Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_H6(), XhtmlFactory.eINSTANCE.createXhtmlH6Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Ul(),
-					 XhtmlFactory.eINSTANCE.createXhtmlUlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Ul(), XhtmlFactory.eINSTANCE.createXhtmlUlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Ol(),
-					 XhtmlFactory.eINSTANCE.createXhtmlOlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Ol(), XhtmlFactory.eINSTANCE.createXhtmlOlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Dl(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Dl(), XhtmlFactory.eINSTANCE.createXhtmlDlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_P(),
-					 XhtmlFactory.eINSTANCE.createXhtmlPType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_P(), XhtmlFactory.eINSTANCE.createXhtmlPType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Div(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDivType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Div(), XhtmlFactory.eINSTANCE.createXhtmlDivType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Pre(),
-					 XhtmlFactory.eINSTANCE.createXhtmlPreType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Pre(), XhtmlFactory.eINSTANCE.createXhtmlPreType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Blockquote(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBlockquoteType())));
+		newChildDescriptors
+				.add(createChildParameter(
+						XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+						FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Blockquote(),
+								XhtmlFactory.eINSTANCE.createXhtmlBlockquoteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Address(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAddressType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Address(), XhtmlFactory.eINSTANCE.createXhtmlAddressType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Hr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlHrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Hr(), XhtmlFactory.eINSTANCE.createXhtmlHrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Table(),
-					 XhtmlFactory.eINSTANCE.createXhtmlTableType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Table(), XhtmlFactory.eINSTANCE.createXhtmlTableType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEditType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEditType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEditType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -681,35 +417,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlEditType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlEmTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlEmTypeItemProvider.java
index ffa88ac..e09cc13 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlEmTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlEmTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlEmTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlEmTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlEmTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlEmType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEmType_class_feature", "_UI_XhtmlEmType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlEmType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlEmType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEmType_class_feature", "_UI_XhtmlEmType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlEmType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlEmType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEmType_id_feature", "_UI_XhtmlEmType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlEmType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlEmType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEmType_id_feature", "_UI_XhtmlEmType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlEmType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlEmType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEmType_lang_feature", "_UI_XhtmlEmType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlEmType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlEmType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEmType_lang_feature", "_UI_XhtmlEmType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlEmType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlEmType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEmType_space_feature", "_UI_XhtmlEmType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlEmType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlEmType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEmType_space_feature", "_UI_XhtmlEmType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlEmType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlEmType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEmType_style_feature", "_UI_XhtmlEmType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlEmType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlEmType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEmType_style_feature", "_UI_XhtmlEmType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlEmType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlEmType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEmType_title_feature", "_UI_XhtmlEmType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlEmType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlEmType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlEmType_title_feature", "_UI_XhtmlEmType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlEmType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlEmType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlEmType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlEmType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlEmType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlEmType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlEmType_type") :
-			getString("_UI_XhtmlEmType_type") + " " + label;
+		String label = ((XhtmlEmType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlEmType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlEmType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlEmType.class)) {
-			case XhtmlPackage.XHTML_EM_TYPE__CLASS:
-			case XhtmlPackage.XHTML_EM_TYPE__ID:
-			case XhtmlPackage.XHTML_EM_TYPE__LANG:
-			case XhtmlPackage.XHTML_EM_TYPE__SPACE:
-			case XhtmlPackage.XHTML_EM_TYPE__STYLE:
-			case XhtmlPackage.XHTML_EM_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_EM_TYPE__CLASS:
+		case XhtmlPackage.XHTML_EM_TYPE__ID:
+		case XhtmlPackage.XHTML_EM_TYPE__LANG:
+		case XhtmlPackage.XHTML_EM_TYPE__SPACE:
+		case XhtmlPackage.XHTML_EM_TYPE__STYLE:
+		case XhtmlPackage.XHTML_EM_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlEmType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlEmType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlEmType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlEmType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH1TypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH1TypeItemProvider.java
index e11117e..3e482da 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH1TypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH1TypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlH1TypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlH1TypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlH1TypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH1Type_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH1Type_class_feature", "_UI_XhtmlH1Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH1Type_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH1Type_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH1Type_class_feature", "_UI_XhtmlH1Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH1Type_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH1Type_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH1Type_id_feature", "_UI_XhtmlH1Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH1Type_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH1Type_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH1Type_id_feature", "_UI_XhtmlH1Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH1Type_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH1Type_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH1Type_lang_feature", "_UI_XhtmlH1Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH1Type_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH1Type_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH1Type_lang_feature", "_UI_XhtmlH1Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH1Type_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH1Type_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH1Type_space_feature", "_UI_XhtmlH1Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH1Type_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH1Type_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH1Type_space_feature", "_UI_XhtmlH1Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH1Type_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH1Type_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH1Type_style_feature", "_UI_XhtmlH1Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH1Type_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH1Type_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH1Type_style_feature", "_UI_XhtmlH1Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH1Type_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH1Type_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH1Type_title_feature", "_UI_XhtmlH1Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH1Type_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH1Type_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH1Type_title_feature", "_UI_XhtmlH1Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH1Type_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlH1Type.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlH1Type.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlH1Type"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlH1Type")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlH1Type)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlH1Type_type") :
-			getString("_UI_XhtmlH1Type_type") + " " + label;
+		String label = ((XhtmlH1Type) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlH1Type_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlH1Type_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlH1Type.class)) {
-			case XhtmlPackage.XHTML_H1_TYPE__CLASS:
-			case XhtmlPackage.XHTML_H1_TYPE__ID:
-			case XhtmlPackage.XHTML_H1_TYPE__LANG:
-			case XhtmlPackage.XHTML_H1_TYPE__SPACE:
-			case XhtmlPackage.XHTML_H1_TYPE__STYLE:
-			case XhtmlPackage.XHTML_H1_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_H1_TYPE__CLASS:
+		case XhtmlPackage.XHTML_H1_TYPE__ID:
+		case XhtmlPackage.XHTML_H1_TYPE__LANG:
+		case XhtmlPackage.XHTML_H1_TYPE__SPACE:
+		case XhtmlPackage.XHTML_H1_TYPE__STYLE:
+		case XhtmlPackage.XHTML_H1_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH1Type_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH1Type_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH2TypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH2TypeItemProvider.java
index 79b8cc0..5995781 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH2TypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH2TypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlH2TypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlH2TypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlH2TypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH2Type_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH2Type_class_feature", "_UI_XhtmlH2Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH2Type_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH2Type_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH2Type_class_feature", "_UI_XhtmlH2Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH2Type_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH2Type_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH2Type_id_feature", "_UI_XhtmlH2Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH2Type_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH2Type_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH2Type_id_feature", "_UI_XhtmlH2Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH2Type_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH2Type_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH2Type_lang_feature", "_UI_XhtmlH2Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH2Type_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH2Type_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH2Type_lang_feature", "_UI_XhtmlH2Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH2Type_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH2Type_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH2Type_space_feature", "_UI_XhtmlH2Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH2Type_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH2Type_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH2Type_space_feature", "_UI_XhtmlH2Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH2Type_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH2Type_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH2Type_style_feature", "_UI_XhtmlH2Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH2Type_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH2Type_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH2Type_style_feature", "_UI_XhtmlH2Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH2Type_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH2Type_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH2Type_title_feature", "_UI_XhtmlH2Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH2Type_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH2Type_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH2Type_title_feature", "_UI_XhtmlH2Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH2Type_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlH2Type.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlH2Type.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlH2Type"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlH2Type")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlH2Type)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlH2Type_type") :
-			getString("_UI_XhtmlH2Type_type") + " " + label;
+		String label = ((XhtmlH2Type) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlH2Type_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlH2Type_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlH2Type.class)) {
-			case XhtmlPackage.XHTML_H2_TYPE__CLASS:
-			case XhtmlPackage.XHTML_H2_TYPE__ID:
-			case XhtmlPackage.XHTML_H2_TYPE__LANG:
-			case XhtmlPackage.XHTML_H2_TYPE__SPACE:
-			case XhtmlPackage.XHTML_H2_TYPE__STYLE:
-			case XhtmlPackage.XHTML_H2_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_H2_TYPE__CLASS:
+		case XhtmlPackage.XHTML_H2_TYPE__ID:
+		case XhtmlPackage.XHTML_H2_TYPE__LANG:
+		case XhtmlPackage.XHTML_H2_TYPE__SPACE:
+		case XhtmlPackage.XHTML_H2_TYPE__STYLE:
+		case XhtmlPackage.XHTML_H2_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH2Type_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH2Type_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH3TypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH3TypeItemProvider.java
index f81a17d..d6c22cc 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH3TypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH3TypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlH3TypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlH3TypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlH3TypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH3Type_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH3Type_class_feature", "_UI_XhtmlH3Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH3Type_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH3Type_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH3Type_class_feature", "_UI_XhtmlH3Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH3Type_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH3Type_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH3Type_id_feature", "_UI_XhtmlH3Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH3Type_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH3Type_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH3Type_id_feature", "_UI_XhtmlH3Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH3Type_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH3Type_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH3Type_lang_feature", "_UI_XhtmlH3Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH3Type_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH3Type_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH3Type_lang_feature", "_UI_XhtmlH3Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH3Type_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH3Type_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH3Type_space_feature", "_UI_XhtmlH3Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH3Type_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH3Type_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH3Type_space_feature", "_UI_XhtmlH3Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH3Type_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH3Type_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH3Type_style_feature", "_UI_XhtmlH3Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH3Type_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH3Type_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH3Type_style_feature", "_UI_XhtmlH3Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH3Type_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH3Type_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH3Type_title_feature", "_UI_XhtmlH3Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH3Type_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH3Type_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH3Type_title_feature", "_UI_XhtmlH3Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH3Type_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlH3Type.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlH3Type.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlH3Type"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlH3Type")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlH3Type)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlH3Type_type") :
-			getString("_UI_XhtmlH3Type_type") + " " + label;
+		String label = ((XhtmlH3Type) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlH3Type_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlH3Type_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlH3Type.class)) {
-			case XhtmlPackage.XHTML_H3_TYPE__CLASS:
-			case XhtmlPackage.XHTML_H3_TYPE__ID:
-			case XhtmlPackage.XHTML_H3_TYPE__LANG:
-			case XhtmlPackage.XHTML_H3_TYPE__SPACE:
-			case XhtmlPackage.XHTML_H3_TYPE__STYLE:
-			case XhtmlPackage.XHTML_H3_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_H3_TYPE__CLASS:
+		case XhtmlPackage.XHTML_H3_TYPE__ID:
+		case XhtmlPackage.XHTML_H3_TYPE__LANG:
+		case XhtmlPackage.XHTML_H3_TYPE__SPACE:
+		case XhtmlPackage.XHTML_H3_TYPE__STYLE:
+		case XhtmlPackage.XHTML_H3_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH3Type_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH3Type_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH4TypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH4TypeItemProvider.java
index 54c7ac5..7984e2f 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH4TypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH4TypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlH4TypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlH4TypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlH4TypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH4Type_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH4Type_class_feature", "_UI_XhtmlH4Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH4Type_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH4Type_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH4Type_class_feature", "_UI_XhtmlH4Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH4Type_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH4Type_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH4Type_id_feature", "_UI_XhtmlH4Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH4Type_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH4Type_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH4Type_id_feature", "_UI_XhtmlH4Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH4Type_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH4Type_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH4Type_lang_feature", "_UI_XhtmlH4Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH4Type_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH4Type_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH4Type_lang_feature", "_UI_XhtmlH4Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH4Type_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH4Type_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH4Type_space_feature", "_UI_XhtmlH4Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH4Type_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH4Type_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH4Type_space_feature", "_UI_XhtmlH4Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH4Type_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH4Type_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH4Type_style_feature", "_UI_XhtmlH4Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH4Type_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH4Type_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH4Type_style_feature", "_UI_XhtmlH4Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH4Type_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH4Type_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH4Type_title_feature", "_UI_XhtmlH4Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH4Type_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH4Type_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH4Type_title_feature", "_UI_XhtmlH4Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH4Type_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlH4Type.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlH4Type.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlH4Type"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlH4Type")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlH4Type)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlH4Type_type") :
-			getString("_UI_XhtmlH4Type_type") + " " + label;
+		String label = ((XhtmlH4Type) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlH4Type_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlH4Type_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlH4Type.class)) {
-			case XhtmlPackage.XHTML_H4_TYPE__CLASS:
-			case XhtmlPackage.XHTML_H4_TYPE__ID:
-			case XhtmlPackage.XHTML_H4_TYPE__LANG:
-			case XhtmlPackage.XHTML_H4_TYPE__SPACE:
-			case XhtmlPackage.XHTML_H4_TYPE__STYLE:
-			case XhtmlPackage.XHTML_H4_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_H4_TYPE__CLASS:
+		case XhtmlPackage.XHTML_H4_TYPE__ID:
+		case XhtmlPackage.XHTML_H4_TYPE__LANG:
+		case XhtmlPackage.XHTML_H4_TYPE__SPACE:
+		case XhtmlPackage.XHTML_H4_TYPE__STYLE:
+		case XhtmlPackage.XHTML_H4_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH4Type_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH4Type_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH5TypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH5TypeItemProvider.java
index ee15b82..ef60443 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH5TypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH5TypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlH5TypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlH5TypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlH5TypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH5Type_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH5Type_class_feature", "_UI_XhtmlH5Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH5Type_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH5Type_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH5Type_class_feature", "_UI_XhtmlH5Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH5Type_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH5Type_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH5Type_id_feature", "_UI_XhtmlH5Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH5Type_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH5Type_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH5Type_id_feature", "_UI_XhtmlH5Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH5Type_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH5Type_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH5Type_lang_feature", "_UI_XhtmlH5Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH5Type_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH5Type_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH5Type_lang_feature", "_UI_XhtmlH5Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH5Type_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH5Type_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH5Type_space_feature", "_UI_XhtmlH5Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH5Type_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH5Type_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH5Type_space_feature", "_UI_XhtmlH5Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH5Type_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH5Type_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH5Type_style_feature", "_UI_XhtmlH5Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH5Type_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH5Type_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH5Type_style_feature", "_UI_XhtmlH5Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH5Type_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH5Type_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH5Type_title_feature", "_UI_XhtmlH5Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH5Type_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH5Type_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH5Type_title_feature", "_UI_XhtmlH5Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH5Type_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlH5Type.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlH5Type.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlH5Type"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlH5Type")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlH5Type)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlH5Type_type") :
-			getString("_UI_XhtmlH5Type_type") + " " + label;
+		String label = ((XhtmlH5Type) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlH5Type_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlH5Type_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlH5Type.class)) {
-			case XhtmlPackage.XHTML_H5_TYPE__CLASS:
-			case XhtmlPackage.XHTML_H5_TYPE__ID:
-			case XhtmlPackage.XHTML_H5_TYPE__LANG:
-			case XhtmlPackage.XHTML_H5_TYPE__SPACE:
-			case XhtmlPackage.XHTML_H5_TYPE__STYLE:
-			case XhtmlPackage.XHTML_H5_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_H5_TYPE__CLASS:
+		case XhtmlPackage.XHTML_H5_TYPE__ID:
+		case XhtmlPackage.XHTML_H5_TYPE__LANG:
+		case XhtmlPackage.XHTML_H5_TYPE__SPACE:
+		case XhtmlPackage.XHTML_H5_TYPE__STYLE:
+		case XhtmlPackage.XHTML_H5_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH5Type_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH5Type_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH6TypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH6TypeItemProvider.java
index 3f27613..6b1f020 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH6TypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlH6TypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlH6TypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlH6TypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlH6TypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH6Type_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH6Type_class_feature", "_UI_XhtmlH6Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH6Type_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH6Type_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH6Type_class_feature", "_UI_XhtmlH6Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH6Type_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH6Type_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH6Type_id_feature", "_UI_XhtmlH6Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH6Type_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH6Type_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH6Type_id_feature", "_UI_XhtmlH6Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH6Type_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH6Type_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH6Type_lang_feature", "_UI_XhtmlH6Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH6Type_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH6Type_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH6Type_lang_feature", "_UI_XhtmlH6Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH6Type_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH6Type_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH6Type_space_feature", "_UI_XhtmlH6Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH6Type_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH6Type_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH6Type_space_feature", "_UI_XhtmlH6Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH6Type_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH6Type_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH6Type_style_feature", "_UI_XhtmlH6Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH6Type_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH6Type_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH6Type_style_feature", "_UI_XhtmlH6Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH6Type_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlH6Type_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH6Type_title_feature", "_UI_XhtmlH6Type_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlH6Type_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlH6Type_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlH6Type_title_feature", "_UI_XhtmlH6Type_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlH6Type_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlH6Type.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlH6Type.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlH6Type"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlH6Type")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlH6Type)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlH6Type_type") :
-			getString("_UI_XhtmlH6Type_type") + " " + label;
+		String label = ((XhtmlH6Type) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlH6Type_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlH6Type_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlH6Type.class)) {
-			case XhtmlPackage.XHTML_H6_TYPE__CLASS:
-			case XhtmlPackage.XHTML_H6_TYPE__ID:
-			case XhtmlPackage.XHTML_H6_TYPE__LANG:
-			case XhtmlPackage.XHTML_H6_TYPE__SPACE:
-			case XhtmlPackage.XHTML_H6_TYPE__STYLE:
-			case XhtmlPackage.XHTML_H6_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_H6_TYPE__CLASS:
+		case XhtmlPackage.XHTML_H6_TYPE__ID:
+		case XhtmlPackage.XHTML_H6_TYPE__LANG:
+		case XhtmlPackage.XHTML_H6_TYPE__SPACE:
+		case XhtmlPackage.XHTML_H6_TYPE__STYLE:
+		case XhtmlPackage.XHTML_H6_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlH6Type_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlH6Type_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlHeadingTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlHeadingTypeItemProvider.java
index 1bd91a8..3d4620f 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlHeadingTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlHeadingTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlHeadingTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlHeadingTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlHeadingTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlHeadingType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHeadingType_class_feature", "_UI_XhtmlHeadingType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlHeadingType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHeadingType_class_feature", "_UI_XhtmlHeadingType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlHeadingType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHeadingType_id_feature", "_UI_XhtmlHeadingType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlHeadingType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHeadingType_id_feature", "_UI_XhtmlHeadingType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlHeadingType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHeadingType_lang_feature", "_UI_XhtmlHeadingType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlHeadingType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHeadingType_lang_feature", "_UI_XhtmlHeadingType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlHeadingType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHeadingType_space_feature", "_UI_XhtmlHeadingType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlHeadingType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHeadingType_space_feature", "_UI_XhtmlHeadingType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlHeadingType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHeadingType_style_feature", "_UI_XhtmlHeadingType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlHeadingType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHeadingType_style_feature", "_UI_XhtmlHeadingType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlHeadingType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHeadingType_title_feature", "_UI_XhtmlHeadingType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlHeadingType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHeadingType_title_feature", "_UI_XhtmlHeadingType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlHeadingType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlHeadingType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlHeadingType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlHeadingType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlHeadingType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlHeadingType_type") :
-			getString("_UI_XhtmlHeadingType_type") + " " + label;
+		String label = ((XhtmlHeadingType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlHeadingType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlHeadingType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlHeadingType.class)) {
-			case XhtmlPackage.XHTML_HEADING_TYPE__CLASS:
-			case XhtmlPackage.XHTML_HEADING_TYPE__ID:
-			case XhtmlPackage.XHTML_HEADING_TYPE__LANG:
-			case XhtmlPackage.XHTML_HEADING_TYPE__SPACE:
-			case XhtmlPackage.XHTML_HEADING_TYPE__STYLE:
-			case XhtmlPackage.XHTML_HEADING_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__CLASS:
+		case XhtmlPackage.XHTML_HEADING_TYPE__ID:
+		case XhtmlPackage.XHTML_HEADING_TYPE__LANG:
+		case XhtmlPackage.XHTML_HEADING_TYPE__SPACE:
+		case XhtmlPackage.XHTML_HEADING_TYPE__STYLE:
+		case XhtmlPackage.XHTML_HEADING_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,31 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Tt()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_I() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_B()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Small()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Sup()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlHeadingType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlHrTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlHrTypeItemProvider.java
index f68299b..bc02bcd 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlHrTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlHrTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -35,23 +34,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlHrTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlHrTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlHrTypeItemProvider(AdapterFactory adapterFactory) {
@@ -59,9 +51,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -80,167 +71,104 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlHrType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHrType_class_feature", "_UI_XhtmlHrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlHrType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlHrType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHrType_class_feature", "_UI_XhtmlHrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlHrType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlHrType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHrType_id_feature", "_UI_XhtmlHrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlHrType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlHrType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHrType_id_feature", "_UI_XhtmlHrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlHrType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlHrType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHrType_lang_feature", "_UI_XhtmlHrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlHrType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlHrType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHrType_lang_feature", "_UI_XhtmlHrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlHrType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlHrType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHrType_space_feature", "_UI_XhtmlHrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlHrType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlHrType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHrType_space_feature", "_UI_XhtmlHrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlHrType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlHrType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHrType_style_feature", "_UI_XhtmlHrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlHrType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlHrType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHrType_style_feature", "_UI_XhtmlHrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlHrType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlHrType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHrType_title_feature", "_UI_XhtmlHrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlHrType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlHrType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlHrType_title_feature", "_UI_XhtmlHrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlHrType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This returns XhtmlHrType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlHrType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlHrType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlHrType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlHrType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlHrType_type") :
-			getString("_UI_XhtmlHrType_type") + " " + label;
+		String label = ((XhtmlHrType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlHrType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlHrType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -248,23 +176,22 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlHrType.class)) {
-			case XhtmlPackage.XHTML_HR_TYPE__CLASS:
-			case XhtmlPackage.XHTML_HR_TYPE__ID:
-			case XhtmlPackage.XHTML_HR_TYPE__LANG:
-			case XhtmlPackage.XHTML_HR_TYPE__SPACE:
-			case XhtmlPackage.XHTML_HR_TYPE__STYLE:
-			case XhtmlPackage.XHTML_HR_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		case XhtmlPackage.XHTML_HR_TYPE__CLASS:
+		case XhtmlPackage.XHTML_HR_TYPE__ID:
+		case XhtmlPackage.XHTML_HR_TYPE__LANG:
+		case XhtmlPackage.XHTML_HR_TYPE__SPACE:
+		case XhtmlPackage.XHTML_HR_TYPE__STYLE:
+		case XhtmlPackage.XHTML_HR_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -273,9 +200,8 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlInlPresTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlInlPresTypeItemProvider.java
index 36ffa44..49af6b1 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlInlPresTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlInlPresTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlInlPresTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlInlPresTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlInlPresTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlInlPresType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlInlPresType_class_feature", "_UI_XhtmlInlPresType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlInlPresType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlInlPresType_class_feature", "_UI_XhtmlInlPresType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlInlPresType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlInlPresType_id_feature", "_UI_XhtmlInlPresType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlInlPresType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlInlPresType_id_feature", "_UI_XhtmlInlPresType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlInlPresType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlInlPresType_lang_feature", "_UI_XhtmlInlPresType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlInlPresType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlInlPresType_lang_feature", "_UI_XhtmlInlPresType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlInlPresType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlInlPresType_space_feature", "_UI_XhtmlInlPresType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlInlPresType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlInlPresType_space_feature", "_UI_XhtmlInlPresType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlInlPresType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlInlPresType_style_feature", "_UI_XhtmlInlPresType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlInlPresType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlInlPresType_style_feature", "_UI_XhtmlInlPresType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlInlPresType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlInlPresType_title_feature", "_UI_XhtmlInlPresType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlInlPresType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlInlPresType_title_feature", "_UI_XhtmlInlPresType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlInlPresType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlInlPresType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlInlPresType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlInlPresType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlInlPresType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlInlPresType_type") :
-			getString("_UI_XhtmlInlPresType_type") + " " + label;
+		String label = ((XhtmlInlPresType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlInlPresType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlInlPresType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlInlPresType.class)) {
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__CLASS:
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__ID:
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__LANG:
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SPACE:
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__STYLE:
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__CLASS:
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__ID:
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__LANG:
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SPACE:
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__STYLE:
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,31 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Tt()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_I() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_B()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Small()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Sup()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlInlPresType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlItemProviderAdapterFactory.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlItemProviderAdapterFactory.java
index 2973cf4..806d65e 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlItemProviderAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlItemProviderAdapterFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -33,43 +33,41 @@
 import org.eclipse.rmf.reqif10.xhtml.util.XhtmlAdapterFactory;
 
 /**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the factory that is used to provide the interfaces needed to support Viewers. The adapters generated by this
+ * factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
+ * also support Eclipse property sheets. Note that most of the adapters are shared among multiple instances. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class XhtmlItemProviderAdapterFactory extends XhtmlAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
 
 	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IChangeNotifier changeNotifier = new ChangeNotifier();
 
 	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected Collection<Object> supportedTypes = new ArrayList<Object>();
 
 	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlItemProviderAdapterFactory() {
@@ -82,16 +80,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DocumentRootItemProvider documentRootItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -105,16 +103,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlAbbrTypeItemProvider xhtmlAbbrTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,17 +125,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlAcronymTypeItemProvider xhtmlAcronymTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -150,17 +148,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlAddressTypeItemProvider xhtmlAddressTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -173,17 +171,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlATypeItemProvider xhtmlATypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -196,17 +194,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlBlockquoteTypeItemProvider xhtmlBlockquoteTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -220,16 +218,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlBrTypeItemProvider xhtmlBrTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -242,17 +240,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlCaptionTypeItemProvider xhtmlCaptionTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,16 +264,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlCiteTypeItemProvider xhtmlCiteTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -289,16 +287,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlCodeTypeItemProvider xhtmlCodeTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -311,17 +309,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlColgroupTypeItemProvider xhtmlColgroupTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -335,16 +333,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlColTypeItemProvider xhtmlColTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -358,16 +356,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlDdTypeItemProvider xhtmlDdTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -381,16 +379,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlDfnTypeItemProvider xhtmlDfnTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -404,16 +402,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlDivTypeItemProvider xhtmlDivTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -427,16 +425,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlDlTypeItemProvider xhtmlDlTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -450,16 +448,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlDtTypeItemProvider xhtmlDtTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -473,16 +471,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlEditTypeItemProvider xhtmlEditTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -496,16 +494,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlEmTypeItemProvider xhtmlEmTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -519,16 +517,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlH1TypeItemProvider xhtmlH1TypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -542,16 +540,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlH2TypeItemProvider xhtmlH2TypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -565,16 +563,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlH3TypeItemProvider xhtmlH3TypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -588,16 +586,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlH4TypeItemProvider xhtmlH4TypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -611,16 +609,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlH5TypeItemProvider xhtmlH5TypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -634,16 +632,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlH6TypeItemProvider xhtmlH6TypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -656,17 +654,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlHeadingTypeItemProvider xhtmlHeadingTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -680,16 +678,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlHrTypeItemProvider xhtmlHrTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -702,17 +700,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlInlPresTypeItemProvider xhtmlInlPresTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -726,16 +724,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlKbdTypeItemProvider xhtmlKbdTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -749,16 +747,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlLiTypeItemProvider xhtmlLiTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -772,16 +770,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlObjectTypeItemProvider xhtmlObjectTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -795,16 +793,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlOlTypeItemProvider xhtmlOlTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -818,16 +816,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlParamTypeItemProvider xhtmlParamTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -841,16 +839,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlPreTypeItemProvider xhtmlPreTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -863,17 +861,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlPTypeItemProvider xhtmlPTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -886,17 +884,17 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlQTypeItemProvider xhtmlQTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -910,16 +908,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlSampTypeItemProvider xhtmlSampTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -933,16 +931,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlSpanTypeItemProvider xhtmlSpanTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -956,16 +954,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlStrongTypeItemProvider xhtmlStrongTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -979,16 +977,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlTableTypeItemProvider xhtmlTableTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1002,16 +1000,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlTbodyTypeItemProvider xhtmlTbodyTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1025,16 +1023,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlTdTypeItemProvider xhtmlTdTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1048,16 +1046,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlTfootTypeItemProvider xhtmlTfootTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1071,16 +1069,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlTheadTypeItemProvider xhtmlTheadTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1094,16 +1092,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlThTypeItemProvider xhtmlThTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1117,16 +1115,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlTrTypeItemProvider xhtmlTrTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1140,16 +1138,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlUlTypeItemProvider xhtmlUlTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1163,16 +1161,16 @@
 
 	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlVarTypeItemProvider xhtmlVarTypeItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1185,9 +1183,8 @@
 	}
 
 	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the root adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ComposeableAdapterFactory getRootAdapterFactory() {
@@ -1195,9 +1192,8 @@
 	}
 
 	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
@@ -1205,8 +1201,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1215,9 +1211,9 @@
 	}
 
 	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This implementation substitutes the factory itself as the key for the adapter. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1226,15 +1222,15 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object adapt(Object object, Object type) {
 		if (isFactoryForType(type)) {
 			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -1243,9 +1239,8 @@
 	}
 
 	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -1253,9 +1248,8 @@
 	}
 
 	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -1263,9 +1257,9 @@
 	}
 
 	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void fireNotifyChanged(Notification notification) {
@@ -1277,60 +1271,107 @@
 	}
 
 	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This disposes all of the item providers created by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void dispose() {
-		if (documentRootItemProvider != null) documentRootItemProvider.dispose();
-		if (xhtmlAbbrTypeItemProvider != null) xhtmlAbbrTypeItemProvider.dispose();
-		if (xhtmlAcronymTypeItemProvider != null) xhtmlAcronymTypeItemProvider.dispose();
-		if (xhtmlAddressTypeItemProvider != null) xhtmlAddressTypeItemProvider.dispose();
-		if (xhtmlATypeItemProvider != null) xhtmlATypeItemProvider.dispose();
-		if (xhtmlBlockquoteTypeItemProvider != null) xhtmlBlockquoteTypeItemProvider.dispose();
-		if (xhtmlBrTypeItemProvider != null) xhtmlBrTypeItemProvider.dispose();
-		if (xhtmlCaptionTypeItemProvider != null) xhtmlCaptionTypeItemProvider.dispose();
-		if (xhtmlCiteTypeItemProvider != null) xhtmlCiteTypeItemProvider.dispose();
-		if (xhtmlCodeTypeItemProvider != null) xhtmlCodeTypeItemProvider.dispose();
-		if (xhtmlColgroupTypeItemProvider != null) xhtmlColgroupTypeItemProvider.dispose();
-		if (xhtmlColTypeItemProvider != null) xhtmlColTypeItemProvider.dispose();
-		if (xhtmlDdTypeItemProvider != null) xhtmlDdTypeItemProvider.dispose();
-		if (xhtmlDfnTypeItemProvider != null) xhtmlDfnTypeItemProvider.dispose();
-		if (xhtmlDivTypeItemProvider != null) xhtmlDivTypeItemProvider.dispose();
-		if (xhtmlDlTypeItemProvider != null) xhtmlDlTypeItemProvider.dispose();
-		if (xhtmlDtTypeItemProvider != null) xhtmlDtTypeItemProvider.dispose();
-		if (xhtmlEditTypeItemProvider != null) xhtmlEditTypeItemProvider.dispose();
-		if (xhtmlEmTypeItemProvider != null) xhtmlEmTypeItemProvider.dispose();
-		if (xhtmlH1TypeItemProvider != null) xhtmlH1TypeItemProvider.dispose();
-		if (xhtmlH2TypeItemProvider != null) xhtmlH2TypeItemProvider.dispose();
-		if (xhtmlH3TypeItemProvider != null) xhtmlH3TypeItemProvider.dispose();
-		if (xhtmlH4TypeItemProvider != null) xhtmlH4TypeItemProvider.dispose();
-		if (xhtmlH5TypeItemProvider != null) xhtmlH5TypeItemProvider.dispose();
-		if (xhtmlH6TypeItemProvider != null) xhtmlH6TypeItemProvider.dispose();
-		if (xhtmlHeadingTypeItemProvider != null) xhtmlHeadingTypeItemProvider.dispose();
-		if (xhtmlHrTypeItemProvider != null) xhtmlHrTypeItemProvider.dispose();
-		if (xhtmlInlPresTypeItemProvider != null) xhtmlInlPresTypeItemProvider.dispose();
-		if (xhtmlKbdTypeItemProvider != null) xhtmlKbdTypeItemProvider.dispose();
-		if (xhtmlLiTypeItemProvider != null) xhtmlLiTypeItemProvider.dispose();
-		if (xhtmlObjectTypeItemProvider != null) xhtmlObjectTypeItemProvider.dispose();
-		if (xhtmlOlTypeItemProvider != null) xhtmlOlTypeItemProvider.dispose();
-		if (xhtmlParamTypeItemProvider != null) xhtmlParamTypeItemProvider.dispose();
-		if (xhtmlPreTypeItemProvider != null) xhtmlPreTypeItemProvider.dispose();
-		if (xhtmlPTypeItemProvider != null) xhtmlPTypeItemProvider.dispose();
-		if (xhtmlQTypeItemProvider != null) xhtmlQTypeItemProvider.dispose();
-		if (xhtmlSampTypeItemProvider != null) xhtmlSampTypeItemProvider.dispose();
-		if (xhtmlSpanTypeItemProvider != null) xhtmlSpanTypeItemProvider.dispose();
-		if (xhtmlStrongTypeItemProvider != null) xhtmlStrongTypeItemProvider.dispose();
-		if (xhtmlTableTypeItemProvider != null) xhtmlTableTypeItemProvider.dispose();
-		if (xhtmlTbodyTypeItemProvider != null) xhtmlTbodyTypeItemProvider.dispose();
-		if (xhtmlTdTypeItemProvider != null) xhtmlTdTypeItemProvider.dispose();
-		if (xhtmlTfootTypeItemProvider != null) xhtmlTfootTypeItemProvider.dispose();
-		if (xhtmlTheadTypeItemProvider != null) xhtmlTheadTypeItemProvider.dispose();
-		if (xhtmlThTypeItemProvider != null) xhtmlThTypeItemProvider.dispose();
-		if (xhtmlTrTypeItemProvider != null) xhtmlTrTypeItemProvider.dispose();
-		if (xhtmlUlTypeItemProvider != null) xhtmlUlTypeItemProvider.dispose();
-		if (xhtmlVarTypeItemProvider != null) xhtmlVarTypeItemProvider.dispose();
+		if (documentRootItemProvider != null)
+			documentRootItemProvider.dispose();
+		if (xhtmlAbbrTypeItemProvider != null)
+			xhtmlAbbrTypeItemProvider.dispose();
+		if (xhtmlAcronymTypeItemProvider != null)
+			xhtmlAcronymTypeItemProvider.dispose();
+		if (xhtmlAddressTypeItemProvider != null)
+			xhtmlAddressTypeItemProvider.dispose();
+		if (xhtmlATypeItemProvider != null)
+			xhtmlATypeItemProvider.dispose();
+		if (xhtmlBlockquoteTypeItemProvider != null)
+			xhtmlBlockquoteTypeItemProvider.dispose();
+		if (xhtmlBrTypeItemProvider != null)
+			xhtmlBrTypeItemProvider.dispose();
+		if (xhtmlCaptionTypeItemProvider != null)
+			xhtmlCaptionTypeItemProvider.dispose();
+		if (xhtmlCiteTypeItemProvider != null)
+			xhtmlCiteTypeItemProvider.dispose();
+		if (xhtmlCodeTypeItemProvider != null)
+			xhtmlCodeTypeItemProvider.dispose();
+		if (xhtmlColgroupTypeItemProvider != null)
+			xhtmlColgroupTypeItemProvider.dispose();
+		if (xhtmlColTypeItemProvider != null)
+			xhtmlColTypeItemProvider.dispose();
+		if (xhtmlDdTypeItemProvider != null)
+			xhtmlDdTypeItemProvider.dispose();
+		if (xhtmlDfnTypeItemProvider != null)
+			xhtmlDfnTypeItemProvider.dispose();
+		if (xhtmlDivTypeItemProvider != null)
+			xhtmlDivTypeItemProvider.dispose();
+		if (xhtmlDlTypeItemProvider != null)
+			xhtmlDlTypeItemProvider.dispose();
+		if (xhtmlDtTypeItemProvider != null)
+			xhtmlDtTypeItemProvider.dispose();
+		if (xhtmlEditTypeItemProvider != null)
+			xhtmlEditTypeItemProvider.dispose();
+		if (xhtmlEmTypeItemProvider != null)
+			xhtmlEmTypeItemProvider.dispose();
+		if (xhtmlH1TypeItemProvider != null)
+			xhtmlH1TypeItemProvider.dispose();
+		if (xhtmlH2TypeItemProvider != null)
+			xhtmlH2TypeItemProvider.dispose();
+		if (xhtmlH3TypeItemProvider != null)
+			xhtmlH3TypeItemProvider.dispose();
+		if (xhtmlH4TypeItemProvider != null)
+			xhtmlH4TypeItemProvider.dispose();
+		if (xhtmlH5TypeItemProvider != null)
+			xhtmlH5TypeItemProvider.dispose();
+		if (xhtmlH6TypeItemProvider != null)
+			xhtmlH6TypeItemProvider.dispose();
+		if (xhtmlHeadingTypeItemProvider != null)
+			xhtmlHeadingTypeItemProvider.dispose();
+		if (xhtmlHrTypeItemProvider != null)
+			xhtmlHrTypeItemProvider.dispose();
+		if (xhtmlInlPresTypeItemProvider != null)
+			xhtmlInlPresTypeItemProvider.dispose();
+		if (xhtmlKbdTypeItemProvider != null)
+			xhtmlKbdTypeItemProvider.dispose();
+		if (xhtmlLiTypeItemProvider != null)
+			xhtmlLiTypeItemProvider.dispose();
+		if (xhtmlObjectTypeItemProvider != null)
+			xhtmlObjectTypeItemProvider.dispose();
+		if (xhtmlOlTypeItemProvider != null)
+			xhtmlOlTypeItemProvider.dispose();
+		if (xhtmlParamTypeItemProvider != null)
+			xhtmlParamTypeItemProvider.dispose();
+		if (xhtmlPreTypeItemProvider != null)
+			xhtmlPreTypeItemProvider.dispose();
+		if (xhtmlPTypeItemProvider != null)
+			xhtmlPTypeItemProvider.dispose();
+		if (xhtmlQTypeItemProvider != null)
+			xhtmlQTypeItemProvider.dispose();
+		if (xhtmlSampTypeItemProvider != null)
+			xhtmlSampTypeItemProvider.dispose();
+		if (xhtmlSpanTypeItemProvider != null)
+			xhtmlSpanTypeItemProvider.dispose();
+		if (xhtmlStrongTypeItemProvider != null)
+			xhtmlStrongTypeItemProvider.dispose();
+		if (xhtmlTableTypeItemProvider != null)
+			xhtmlTableTypeItemProvider.dispose();
+		if (xhtmlTbodyTypeItemProvider != null)
+			xhtmlTbodyTypeItemProvider.dispose();
+		if (xhtmlTdTypeItemProvider != null)
+			xhtmlTdTypeItemProvider.dispose();
+		if (xhtmlTfootTypeItemProvider != null)
+			xhtmlTfootTypeItemProvider.dispose();
+		if (xhtmlTheadTypeItemProvider != null)
+			xhtmlTheadTypeItemProvider.dispose();
+		if (xhtmlThTypeItemProvider != null)
+			xhtmlThTypeItemProvider.dispose();
+		if (xhtmlTrTypeItemProvider != null)
+			xhtmlTrTypeItemProvider.dispose();
+		if (xhtmlUlTypeItemProvider != null)
+			xhtmlUlTypeItemProvider.dispose();
+		if (xhtmlVarTypeItemProvider != null)
+			xhtmlVarTypeItemProvider.dispose();
 	}
 
 }
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlKbdTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlKbdTypeItemProvider.java
index a6ba58a..bfd8fa6 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlKbdTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlKbdTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlKbdTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlKbdTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlKbdTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlKbdType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlKbdType_class_feature", "_UI_XhtmlKbdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlKbdType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlKbdType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlKbdType_class_feature", "_UI_XhtmlKbdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlKbdType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlKbdType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlKbdType_id_feature", "_UI_XhtmlKbdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlKbdType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlKbdType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlKbdType_id_feature", "_UI_XhtmlKbdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlKbdType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlKbdType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlKbdType_lang_feature", "_UI_XhtmlKbdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlKbdType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlKbdType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlKbdType_lang_feature", "_UI_XhtmlKbdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlKbdType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlKbdType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlKbdType_space_feature", "_UI_XhtmlKbdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlKbdType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlKbdType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlKbdType_space_feature", "_UI_XhtmlKbdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlKbdType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlKbdType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlKbdType_style_feature", "_UI_XhtmlKbdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlKbdType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlKbdType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlKbdType_style_feature", "_UI_XhtmlKbdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlKbdType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlKbdType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlKbdType_title_feature", "_UI_XhtmlKbdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlKbdType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlKbdType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlKbdType_title_feature", "_UI_XhtmlKbdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlKbdType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlKbdType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlKbdType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlKbdType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlKbdType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlKbdType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlKbdType_type") :
-			getString("_UI_XhtmlKbdType_type") + " " + label;
+		String label = ((XhtmlKbdType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlKbdType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlKbdType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlKbdType.class)) {
-			case XhtmlPackage.XHTML_KBD_TYPE__CLASS:
-			case XhtmlPackage.XHTML_KBD_TYPE__ID:
-			case XhtmlPackage.XHTML_KBD_TYPE__LANG:
-			case XhtmlPackage.XHTML_KBD_TYPE__SPACE:
-			case XhtmlPackage.XHTML_KBD_TYPE__STYLE:
-			case XhtmlPackage.XHTML_KBD_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_KBD_TYPE__CLASS:
+		case XhtmlPackage.XHTML_KBD_TYPE__ID:
+		case XhtmlPackage.XHTML_KBD_TYPE__LANG:
+		case XhtmlPackage.XHTML_KBD_TYPE__SPACE:
+		case XhtmlPackage.XHTML_KBD_TYPE__STYLE:
+		case XhtmlPackage.XHTML_KBD_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlKbdType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlKbdType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlLiTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlLiTypeItemProvider.java
index 3603cde..2788749 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlLiTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlLiTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlLiTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlLiTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlLiTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlLiType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlLiType_class_feature", "_UI_XhtmlLiType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlLiType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlLiType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlLiType_class_feature", "_UI_XhtmlLiType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlLiType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlLiType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlLiType_id_feature", "_UI_XhtmlLiType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlLiType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlLiType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlLiType_id_feature", "_UI_XhtmlLiType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlLiType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlLiType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlLiType_lang_feature", "_UI_XhtmlLiType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlLiType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlLiType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlLiType_lang_feature", "_UI_XhtmlLiType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlLiType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlLiType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlLiType_space_feature", "_UI_XhtmlLiType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlLiType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlLiType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlLiType_space_feature", "_UI_XhtmlLiType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlLiType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlLiType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlLiType_style_feature", "_UI_XhtmlLiType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlLiType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlLiType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlLiType_style_feature", "_UI_XhtmlLiType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlLiType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlLiType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlLiType_title_feature", "_UI_XhtmlLiType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlLiType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlLiType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlLiType_title_feature", "_UI_XhtmlLiType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlLiType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlLiType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlLiType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlLiType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlLiType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlLiType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlLiType_type") :
-			getString("_UI_XhtmlLiType_type") + " " + label;
+		String label = ((XhtmlLiType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlLiType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlLiType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,345 +215,170 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlLiType.class)) {
-			case XhtmlPackage.XHTML_LI_TYPE__CLASS:
-			case XhtmlPackage.XHTML_LI_TYPE__ID:
-			case XhtmlPackage.XHTML_LI_TYPE__LANG:
-			case XhtmlPackage.XHTML_LI_TYPE__SPACE:
-			case XhtmlPackage.XHTML_LI_TYPE__STYLE:
-			case XhtmlPackage.XHTML_LI_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_LI_TYPE__CLASS:
+		case XhtmlPackage.XHTML_LI_TYPE__ID:
+		case XhtmlPackage.XHTML_LI_TYPE__LANG:
+		case XhtmlPackage.XHTML_LI_TYPE__SPACE:
+		case XhtmlPackage.XHTML_LI_TYPE__STYLE:
+		case XhtmlPackage.XHTML_LI_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_H1(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH1Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_H1(), XhtmlFactory.eINSTANCE.createXhtmlH1Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_H2(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH2Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_H2(), XhtmlFactory.eINSTANCE.createXhtmlH2Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_H3(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH3Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_H3(), XhtmlFactory.eINSTANCE.createXhtmlH3Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_H4(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH4Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_H4(), XhtmlFactory.eINSTANCE.createXhtmlH4Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_H5(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH5Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_H5(), XhtmlFactory.eINSTANCE.createXhtmlH5Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_H6(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH6Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_H6(), XhtmlFactory.eINSTANCE.createXhtmlH6Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Ul(),
-					 XhtmlFactory.eINSTANCE.createXhtmlUlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Ul(), XhtmlFactory.eINSTANCE.createXhtmlUlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Ol(),
-					 XhtmlFactory.eINSTANCE.createXhtmlOlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Ol(), XhtmlFactory.eINSTANCE.createXhtmlOlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Dl(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Dl(), XhtmlFactory.eINSTANCE.createXhtmlDlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_P(),
-					 XhtmlFactory.eINSTANCE.createXhtmlPType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_P(), XhtmlFactory.eINSTANCE.createXhtmlPType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Div(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDivType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Div(), XhtmlFactory.eINSTANCE.createXhtmlDivType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Pre(),
-					 XhtmlFactory.eINSTANCE.createXhtmlPreType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Pre(), XhtmlFactory.eINSTANCE.createXhtmlPreType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Blockquote(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBlockquoteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Blockquote(), XhtmlFactory.eINSTANCE.createXhtmlBlockquoteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Address(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAddressType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Address(), XhtmlFactory.eINSTANCE.createXhtmlAddressType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Hr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlHrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Hr(), XhtmlFactory.eINSTANCE.createXhtmlHrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Table(),
-					 XhtmlFactory.eINSTANCE.createXhtmlTableType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Table(), XhtmlFactory.eINSTANCE.createXhtmlTableType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlLiType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlLiType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlLiType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -633,35 +386,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlLiType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlObjectTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlObjectTypeItemProvider.java
index 6c003cc..a0182bb 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlObjectTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlObjectTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlObjectTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlObjectTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlObjectTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -101,407 +92,227 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Archive feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Archive feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addArchivePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_archive_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_archive_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Archive(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_archive_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_archive_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Archive(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_class_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_class_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Classid feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Classid feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassidPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_classid_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_classid_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Classid(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_classid_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_classid_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Classid(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Codebase feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Codebase feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCodebasePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_codebase_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_codebase_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Codebase(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_codebase_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_codebase_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Codebase(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Codetype feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Codetype feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCodetypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_codetype_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_codetype_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Codetype(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_codetype_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_codetype_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Codetype(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Data feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Data feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDataPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_data_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_data_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Data(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_data_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_data_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Data(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Declare feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Declare feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDeclarePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_declare_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_declare_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Declare(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_declare_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_declare_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Declare(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Height feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Height feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addHeightPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_height_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_height_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Height(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_height_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_height_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Height(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_id_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_id_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_lang_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_lang_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_name_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Name(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_name_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_name_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Name(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_space_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_space_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Standby feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Standby feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStandbyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_standby_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_standby_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Standby(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_standby_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_standby_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Standby(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_style_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_style_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Tabindex feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Tabindex feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTabindexPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_tabindex_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_tabindex_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Tabindex(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_tabindex_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_tabindex_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Tabindex(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_title_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_title_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_type_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_type_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Type(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_type_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_type_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Type(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Width feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Width feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlObjectType_width_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_width_feature", "_UI_XhtmlObjectType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlObjectType_Width(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlObjectType_width_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlObjectType_width_feature", "_UI_XhtmlObjectType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Width(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -514,8 +325,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -527,35 +338,32 @@
 	}
 
 	/**
-	 * This returns XhtmlObjectType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlObjectType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlObjectType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlObjectType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlObjectType)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlObjectType_type") :
-			getString("_UI_XhtmlObjectType_type") + " " + label;
+		String label = ((XhtmlObjectType) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlObjectType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlObjectType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -563,364 +371,185 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlObjectType.class)) {
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ARCHIVE:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CLASS:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CLASSID:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CODEBASE:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CODETYPE:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DATA:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DECLARE:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__HEIGHT:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ID:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__LANG:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__NAME:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SPACE:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__STANDBY:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__STYLE:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TABINDEX:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TITLE:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TYPE:
-			case XhtmlPackage.XHTML_OBJECT_TYPE__WIDTH:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ARCHIVE:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CLASS:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CLASSID:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CODEBASE:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CODETYPE:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DATA:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DECLARE:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__HEIGHT:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ID:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__LANG:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__NAME:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SPACE:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__STANDBY:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__STYLE:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TABINDEX:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TITLE:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TYPE:
+		case XhtmlPackage.XHTML_OBJECT_TYPE__WIDTH:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Param(),
-					 XhtmlFactory.eINSTANCE.createXhtmlParamType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Param(), XhtmlFactory.eINSTANCE.createXhtmlParamType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_H1(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH1Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_H1(), XhtmlFactory.eINSTANCE.createXhtmlH1Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_H2(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH2Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_H2(), XhtmlFactory.eINSTANCE.createXhtmlH2Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_H3(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH3Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_H3(), XhtmlFactory.eINSTANCE.createXhtmlH3Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_H4(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH4Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_H4(), XhtmlFactory.eINSTANCE.createXhtmlH4Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_H5(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH5Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_H5(), XhtmlFactory.eINSTANCE.createXhtmlH5Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_H6(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH6Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_H6(), XhtmlFactory.eINSTANCE.createXhtmlH6Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Ul(),
-					 XhtmlFactory.eINSTANCE.createXhtmlUlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Ul(), XhtmlFactory.eINSTANCE.createXhtmlUlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Ol(),
-					 XhtmlFactory.eINSTANCE.createXhtmlOlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Ol(), XhtmlFactory.eINSTANCE.createXhtmlOlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Dl(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Dl(), XhtmlFactory.eINSTANCE.createXhtmlDlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_P(),
-					 XhtmlFactory.eINSTANCE.createXhtmlPType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_P(), XhtmlFactory.eINSTANCE.createXhtmlPType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Div(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDivType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Div(), XhtmlFactory.eINSTANCE.createXhtmlDivType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Pre(),
-					 XhtmlFactory.eINSTANCE.createXhtmlPreType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Pre(), XhtmlFactory.eINSTANCE.createXhtmlPreType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Blockquote(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBlockquoteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(), FeatureMapUtil.createEntry(
+				XhtmlPackage.eINSTANCE.getXhtmlObjectType_Blockquote(), XhtmlFactory.eINSTANCE.createXhtmlBlockquoteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Address(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAddressType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Address(), XhtmlFactory.eINSTANCE.createXhtmlAddressType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Hr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlHrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Hr(), XhtmlFactory.eINSTANCE.createXhtmlHrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Table(),
-					 XhtmlFactory.eINSTANCE.createXhtmlTableType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Table(), XhtmlFactory.eINSTANCE.createXhtmlTableType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -928,35 +557,29 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_Tt()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_I() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_B()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_Small()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_Sub() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_Sup()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_Ins() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlObjectType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlOlTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlOlTypeItemProvider.java
index fce3702..0df7352 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlOlTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlOlTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -38,23 +37,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlOlTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlOlTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlOlTypeItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +54,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -83,143 +74,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlOlType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlOlType_class_feature", "_UI_XhtmlOlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlOlType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlOlType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlOlType_class_feature", "_UI_XhtmlOlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlOlType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlOlType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlOlType_id_feature", "_UI_XhtmlOlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlOlType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlOlType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlOlType_id_feature", "_UI_XhtmlOlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlOlType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlOlType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlOlType_lang_feature", "_UI_XhtmlOlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlOlType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlOlType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlOlType_lang_feature", "_UI_XhtmlOlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlOlType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlOlType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlOlType_space_feature", "_UI_XhtmlOlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlOlType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlOlType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlOlType_space_feature", "_UI_XhtmlOlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlOlType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlOlType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlOlType_style_feature", "_UI_XhtmlOlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlOlType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlOlType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlOlType_style_feature", "_UI_XhtmlOlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlOlType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlOlType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlOlType_title_feature", "_UI_XhtmlOlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlOlType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlOlType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlOlType_title_feature", "_UI_XhtmlOlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlOlType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -232,8 +163,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -245,35 +176,32 @@
 	}
 
 	/**
-	 * This returns XhtmlOlType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlOlType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlOlType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlOlType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlOlType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlOlType_type") :
-			getString("_UI_XhtmlOlType_type") + " " + label;
+		String label = ((XhtmlOlType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlOlType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlOlType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -281,42 +209,37 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlOlType.class)) {
-			case XhtmlPackage.XHTML_OL_TYPE__CLASS:
-			case XhtmlPackage.XHTML_OL_TYPE__ID:
-			case XhtmlPackage.XHTML_OL_TYPE__LANG:
-			case XhtmlPackage.XHTML_OL_TYPE__SPACE:
-			case XhtmlPackage.XHTML_OL_TYPE__STYLE:
-			case XhtmlPackage.XHTML_OL_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_OL_TYPE__LI:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_OL_TYPE__CLASS:
+		case XhtmlPackage.XHTML_OL_TYPE__ID:
+		case XhtmlPackage.XHTML_OL_TYPE__LANG:
+		case XhtmlPackage.XHTML_OL_TYPE__SPACE:
+		case XhtmlPackage.XHTML_OL_TYPE__STYLE:
+		case XhtmlPackage.XHTML_OL_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_OL_TYPE__LI:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlOlType_Li(),
-				 XhtmlFactory.eINSTANCE.createXhtmlLiType()));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlOlType_Li(), XhtmlFactory.eINSTANCE.createXhtmlLiType()));
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlPTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlPTypeItemProvider.java
index 9b80e86..dee5dbf 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlPTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlPTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlPTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlPTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlPTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlPType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPType_class_feature", "_UI_XhtmlPType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlPType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlPType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPType_class_feature", "_UI_XhtmlPType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlPType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlPType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPType_id_feature", "_UI_XhtmlPType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlPType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlPType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPType_id_feature", "_UI_XhtmlPType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlPType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlPType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPType_lang_feature", "_UI_XhtmlPType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlPType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlPType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPType_lang_feature", "_UI_XhtmlPType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlPType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlPType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPType_space_feature", "_UI_XhtmlPType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlPType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlPType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPType_space_feature", "_UI_XhtmlPType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlPType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlPType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPType_style_feature", "_UI_XhtmlPType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlPType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlPType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPType_style_feature", "_UI_XhtmlPType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlPType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlPType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPType_title_feature", "_UI_XhtmlPType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlPType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlPType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPType_title_feature", "_UI_XhtmlPType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlPType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlPType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlPType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlPType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlPType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlPType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlPType_type") :
-			getString("_UI_XhtmlPType_type") + " " + label;
+		String label = ((XhtmlPType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlPType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlPType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlPType.class)) {
-			case XhtmlPackage.XHTML_PTYPE__CLASS:
-			case XhtmlPackage.XHTML_PTYPE__ID:
-			case XhtmlPackage.XHTML_PTYPE__LANG:
-			case XhtmlPackage.XHTML_PTYPE__SPACE:
-			case XhtmlPackage.XHTML_PTYPE__STYLE:
-			case XhtmlPackage.XHTML_PTYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_PTYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_PTYPE__CLASS:
+		case XhtmlPackage.XHTML_PTYPE__ID:
+		case XhtmlPackage.XHTML_PTYPE__LANG:
+		case XhtmlPackage.XHTML_PTYPE__SPACE:
+		case XhtmlPackage.XHTML_PTYPE__STYLE:
+		case XhtmlPackage.XHTML_PTYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_PTYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlPType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlParamTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlParamTypeItemProvider.java
index 23cfdce..de73b1e 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlParamTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlParamTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -35,23 +34,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlParamType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlParamTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlParamTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlParamTypeItemProvider(AdapterFactory adapterFactory) {
@@ -59,9 +51,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -79,145 +70,92 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlParamType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlParamType_id_feature", "_UI_XhtmlParamType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlParamType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlParamType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlParamType_id_feature", "_UI_XhtmlParamType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlParamType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlParamType_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlParamType_name_feature", "_UI_XhtmlParamType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlParamType_Name(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlParamType_name_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlParamType_name_feature", "_UI_XhtmlParamType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlParamType_Name(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlParamType_type_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlParamType_type_feature", "_UI_XhtmlParamType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlParamType_Type(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlParamType_type_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlParamType_type_feature", "_UI_XhtmlParamType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlParamType_Type(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Value feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlParamType_value_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlParamType_value_feature", "_UI_XhtmlParamType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlParamType_Value(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlParamType_value_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlParamType_value_feature", "_UI_XhtmlParamType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlParamType_Value(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Valuetype feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Valuetype feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addValuetypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlParamType_valuetype_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlParamType_valuetype_feature", "_UI_XhtmlParamType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlParamType_Valuetype(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlParamType_valuetype_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlParamType_valuetype_feature", "_UI_XhtmlParamType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlParamType_Valuetype(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This returns XhtmlParamType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlParamType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlParamType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlParamType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlParamType)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlParamType_type") :
-			getString("_UI_XhtmlParamType_type") + " " + label;
+		String label = ((XhtmlParamType) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlParamType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlParamType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -225,22 +163,21 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlParamType.class)) {
-			case XhtmlPackage.XHTML_PARAM_TYPE__ID:
-			case XhtmlPackage.XHTML_PARAM_TYPE__NAME:
-			case XhtmlPackage.XHTML_PARAM_TYPE__TYPE:
-			case XhtmlPackage.XHTML_PARAM_TYPE__VALUE:
-			case XhtmlPackage.XHTML_PARAM_TYPE__VALUETYPE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		case XhtmlPackage.XHTML_PARAM_TYPE__ID:
+		case XhtmlPackage.XHTML_PARAM_TYPE__NAME:
+		case XhtmlPackage.XHTML_PARAM_TYPE__TYPE:
+		case XhtmlPackage.XHTML_PARAM_TYPE__VALUE:
+		case XhtmlPackage.XHTML_PARAM_TYPE__VALUETYPE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -249,9 +186,8 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlPreTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlPreTypeItemProvider.java
index c803c73..fc25ac2 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlPreTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlPreTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPreType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlPreTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlPreTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlPreTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlPreType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPreType_class_feature", "_UI_XhtmlPreType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlPreType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlPreType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPreType_class_feature", "_UI_XhtmlPreType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlPreType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlPreType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPreType_id_feature", "_UI_XhtmlPreType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlPreType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlPreType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPreType_id_feature", "_UI_XhtmlPreType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlPreType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlPreType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPreType_lang_feature", "_UI_XhtmlPreType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlPreType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlPreType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPreType_lang_feature", "_UI_XhtmlPreType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlPreType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlPreType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPreType_space_feature", "_UI_XhtmlPreType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlPreType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlPreType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPreType_space_feature", "_UI_XhtmlPreType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlPreType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlPreType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPreType_style_feature", "_UI_XhtmlPreType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlPreType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlPreType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPreType_style_feature", "_UI_XhtmlPreType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlPreType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlPreType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPreType_title_feature", "_UI_XhtmlPreType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlPreType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlPreType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlPreType_title_feature", "_UI_XhtmlPreType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlPreType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlPreType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlPreType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlPreType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlPreType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlPreType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlPreType_type") :
-			getString("_UI_XhtmlPreType_type") + " " + label;
+		String label = ((XhtmlPreType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlPreType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlPreType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,198 +215,107 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlPreType.class)) {
-			case XhtmlPackage.XHTML_PRE_TYPE__CLASS:
-			case XhtmlPackage.XHTML_PRE_TYPE__ID:
-			case XhtmlPackage.XHTML_PRE_TYPE__LANG:
-			case XhtmlPackage.XHTML_PRE_TYPE__SPACE:
-			case XhtmlPackage.XHTML_PRE_TYPE__STYLE:
-			case XhtmlPackage.XHTML_PRE_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_PRE_TYPE__CLASS:
+		case XhtmlPackage.XHTML_PRE_TYPE__ID:
+		case XhtmlPackage.XHTML_PRE_TYPE__LANG:
+		case XhtmlPackage.XHTML_PRE_TYPE__SPACE:
+		case XhtmlPackage.XHTML_PRE_TYPE__STYLE:
+		case XhtmlPackage.XHTML_PRE_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlPreType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlPreType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlPreType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -486,31 +323,26 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlPreType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlPreType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlPreType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlPreType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlPreType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlPreType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlPreType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlPreType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlPreType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlPreType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlQTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlQTypeItemProvider.java
index cfa291c..0befd4d 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlQTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlQTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlQType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlQTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlQTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlQTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -90,165 +81,95 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Cite1 feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Cite1 feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCite1PropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlQType_cite1_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlQType_cite1_feature", "_UI_XhtmlQType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlQType_Cite1(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlQType_cite1_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlQType_cite1_feature", "_UI_XhtmlQType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlQType_Cite1(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlQType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlQType_class_feature", "_UI_XhtmlQType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlQType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlQType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlQType_class_feature", "_UI_XhtmlQType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlQType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlQType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlQType_id_feature", "_UI_XhtmlQType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlQType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlQType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlQType_id_feature", "_UI_XhtmlQType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlQType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlQType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlQType_lang_feature", "_UI_XhtmlQType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlQType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlQType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlQType_lang_feature", "_UI_XhtmlQType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlQType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlQType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlQType_space_feature", "_UI_XhtmlQType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlQType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlQType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlQType_space_feature", "_UI_XhtmlQType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlQType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlQType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlQType_style_feature", "_UI_XhtmlQType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlQType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlQType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlQType_style_feature", "_UI_XhtmlQType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlQType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlQType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlQType_title_feature", "_UI_XhtmlQType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlQType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlQType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlQType_title_feature", "_UI_XhtmlQType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlQType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -261,8 +182,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -274,35 +195,32 @@
 	}
 
 	/**
-	 * This returns XhtmlQType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlQType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlQType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlQType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlQType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlQType_type") :
-			getString("_UI_XhtmlQType_type") + " " + label;
+		String label = ((XhtmlQType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlQType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlQType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -310,234 +228,123 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlQType.class)) {
-			case XhtmlPackage.XHTML_QTYPE__CITE1:
-			case XhtmlPackage.XHTML_QTYPE__CLASS:
-			case XhtmlPackage.XHTML_QTYPE__ID:
-			case XhtmlPackage.XHTML_QTYPE__LANG:
-			case XhtmlPackage.XHTML_QTYPE__SPACE:
-			case XhtmlPackage.XHTML_QTYPE__STYLE:
-			case XhtmlPackage.XHTML_QTYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_QTYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_QTYPE__CITE1:
+		case XhtmlPackage.XHTML_QTYPE__CLASS:
+		case XhtmlPackage.XHTML_QTYPE__ID:
+		case XhtmlPackage.XHTML_QTYPE__LANG:
+		case XhtmlPackage.XHTML_QTYPE__SPACE:
+		case XhtmlPackage.XHTML_QTYPE__STYLE:
+		case XhtmlPackage.XHTML_QTYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_QTYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlQType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlQType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlQType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -545,35 +352,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlQType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlSampTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlSampTypeItemProvider.java
index b68c441..65e337e 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlSampTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlSampTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlSampType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlSampTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlSampTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlSampTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlSampType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSampType_class_feature", "_UI_XhtmlSampType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlSampType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlSampType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSampType_class_feature", "_UI_XhtmlSampType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlSampType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlSampType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSampType_id_feature", "_UI_XhtmlSampType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlSampType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlSampType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSampType_id_feature", "_UI_XhtmlSampType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlSampType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlSampType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSampType_lang_feature", "_UI_XhtmlSampType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlSampType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlSampType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSampType_lang_feature", "_UI_XhtmlSampType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlSampType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlSampType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSampType_space_feature", "_UI_XhtmlSampType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlSampType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlSampType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSampType_space_feature", "_UI_XhtmlSampType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlSampType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlSampType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSampType_style_feature", "_UI_XhtmlSampType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlSampType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlSampType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSampType_style_feature", "_UI_XhtmlSampType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlSampType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlSampType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSampType_title_feature", "_UI_XhtmlSampType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlSampType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlSampType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSampType_title_feature", "_UI_XhtmlSampType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlSampType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlSampType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlSampType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlSampType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlSampType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlSampType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlSampType_type") :
-			getString("_UI_XhtmlSampType_type") + " " + label;
+		String label = ((XhtmlSampType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlSampType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlSampType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlSampType.class)) {
-			case XhtmlPackage.XHTML_SAMP_TYPE__CLASS:
-			case XhtmlPackage.XHTML_SAMP_TYPE__ID:
-			case XhtmlPackage.XHTML_SAMP_TYPE__LANG:
-			case XhtmlPackage.XHTML_SAMP_TYPE__SPACE:
-			case XhtmlPackage.XHTML_SAMP_TYPE__STYLE:
-			case XhtmlPackage.XHTML_SAMP_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__CLASS:
+		case XhtmlPackage.XHTML_SAMP_TYPE__ID:
+		case XhtmlPackage.XHTML_SAMP_TYPE__LANG:
+		case XhtmlPackage.XHTML_SAMP_TYPE__SPACE:
+		case XhtmlPackage.XHTML_SAMP_TYPE__STYLE:
+		case XhtmlPackage.XHTML_SAMP_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSampType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSampType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSampType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlSampType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlSpanTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlSpanTypeItemProvider.java
index 77dd9e1..48b2735 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlSpanTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlSpanTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlSpanTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlSpanTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlSpanTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlSpanType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSpanType_class_feature", "_UI_XhtmlSpanType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlSpanType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlSpanType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSpanType_class_feature", "_UI_XhtmlSpanType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlSpanType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlSpanType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSpanType_id_feature", "_UI_XhtmlSpanType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlSpanType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlSpanType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSpanType_id_feature", "_UI_XhtmlSpanType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlSpanType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlSpanType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSpanType_lang_feature", "_UI_XhtmlSpanType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlSpanType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlSpanType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSpanType_lang_feature", "_UI_XhtmlSpanType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlSpanType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlSpanType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSpanType_space_feature", "_UI_XhtmlSpanType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlSpanType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlSpanType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSpanType_space_feature", "_UI_XhtmlSpanType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlSpanType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlSpanType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSpanType_style_feature", "_UI_XhtmlSpanType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlSpanType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlSpanType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSpanType_style_feature", "_UI_XhtmlSpanType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlSpanType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlSpanType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSpanType_title_feature", "_UI_XhtmlSpanType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlSpanType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlSpanType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlSpanType_title_feature", "_UI_XhtmlSpanType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlSpanType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlSpanType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlSpanType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlSpanType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlSpanType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlSpanType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlSpanType_type") :
-			getString("_UI_XhtmlSpanType_type") + " " + label;
+		String label = ((XhtmlSpanType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlSpanType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlSpanType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlSpanType.class)) {
-			case XhtmlPackage.XHTML_SPAN_TYPE__CLASS:
-			case XhtmlPackage.XHTML_SPAN_TYPE__ID:
-			case XhtmlPackage.XHTML_SPAN_TYPE__LANG:
-			case XhtmlPackage.XHTML_SPAN_TYPE__SPACE:
-			case XhtmlPackage.XHTML_SPAN_TYPE__STYLE:
-			case XhtmlPackage.XHTML_SPAN_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__CLASS:
+		case XhtmlPackage.XHTML_SPAN_TYPE__ID:
+		case XhtmlPackage.XHTML_SPAN_TYPE__LANG:
+		case XhtmlPackage.XHTML_SPAN_TYPE__SPACE:
+		case XhtmlPackage.XHTML_SPAN_TYPE__STYLE:
+		case XhtmlPackage.XHTML_SPAN_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlSpanType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlSpanType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlStrongTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlStrongTypeItemProvider.java
index 464b171..1d9715e 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlStrongTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlStrongTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlStrongTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlStrongTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlStrongTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlStrongType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlStrongType_class_feature", "_UI_XhtmlStrongType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlStrongType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlStrongType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlStrongType_class_feature", "_UI_XhtmlStrongType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlStrongType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlStrongType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlStrongType_id_feature", "_UI_XhtmlStrongType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlStrongType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlStrongType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlStrongType_id_feature", "_UI_XhtmlStrongType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlStrongType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlStrongType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlStrongType_lang_feature", "_UI_XhtmlStrongType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlStrongType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlStrongType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlStrongType_lang_feature", "_UI_XhtmlStrongType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlStrongType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlStrongType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlStrongType_space_feature", "_UI_XhtmlStrongType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlStrongType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlStrongType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlStrongType_space_feature", "_UI_XhtmlStrongType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlStrongType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlStrongType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlStrongType_style_feature", "_UI_XhtmlStrongType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlStrongType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlStrongType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlStrongType_style_feature", "_UI_XhtmlStrongType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlStrongType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlStrongType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlStrongType_title_feature", "_UI_XhtmlStrongType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlStrongType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlStrongType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlStrongType_title_feature", "_UI_XhtmlStrongType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlStrongType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlStrongType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlStrongType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlStrongType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlStrongType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlStrongType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlStrongType_type") :
-			getString("_UI_XhtmlStrongType_type") + " " + label;
+		String label = ((XhtmlStrongType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlStrongType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlStrongType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlStrongType.class)) {
-			case XhtmlPackage.XHTML_STRONG_TYPE__CLASS:
-			case XhtmlPackage.XHTML_STRONG_TYPE__ID:
-			case XhtmlPackage.XHTML_STRONG_TYPE__LANG:
-			case XhtmlPackage.XHTML_STRONG_TYPE__SPACE:
-			case XhtmlPackage.XHTML_STRONG_TYPE__STYLE:
-			case XhtmlPackage.XHTML_STRONG_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__CLASS:
+		case XhtmlPackage.XHTML_STRONG_TYPE__ID:
+		case XhtmlPackage.XHTML_STRONG_TYPE__LANG:
+		case XhtmlPackage.XHTML_STRONG_TYPE__SPACE:
+		case XhtmlPackage.XHTML_STRONG_TYPE__STYLE:
+		case XhtmlPackage.XHTML_STRONG_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlStrongType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,29 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_Tt()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_I() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_B()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_Small()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_Sub() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_Sup()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_Ins() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlStrongType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTableTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTableTypeItemProvider.java
index fe9afb9..45ad97c 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTableTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTableTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -38,23 +37,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlTableType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlTableTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlTableTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlTableTypeItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +54,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -90,297 +81,167 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Border feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Border feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addBorderPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTableType_border_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_border_feature", "_UI_XhtmlTableType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTableType_Border(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTableType_border_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_border_feature", "_UI_XhtmlTableType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTableType_Border(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Cellpadding feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Cellpadding feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCellpaddingPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTableType_cellpadding_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_cellpadding_feature", "_UI_XhtmlTableType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTableType_Cellpadding(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTableType_cellpadding_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_cellpadding_feature", "_UI_XhtmlTableType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTableType_Cellpadding(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Cellspacing feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Cellspacing feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCellspacingPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTableType_cellspacing_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_cellspacing_feature", "_UI_XhtmlTableType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTableType_Cellspacing(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTableType_cellspacing_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_cellspacing_feature", "_UI_XhtmlTableType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTableType_Cellspacing(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTableType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_class_feature", "_UI_XhtmlTableType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTableType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTableType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_class_feature", "_UI_XhtmlTableType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTableType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Frame feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Frame feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addFramePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTableType_frame_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_frame_feature", "_UI_XhtmlTableType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTableType_Frame(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTableType_frame_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_frame_feature", "_UI_XhtmlTableType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTableType_Frame(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTableType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_id_feature", "_UI_XhtmlTableType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTableType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTableType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_id_feature", "_UI_XhtmlTableType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTableType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTableType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_lang_feature", "_UI_XhtmlTableType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTableType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTableType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_lang_feature", "_UI_XhtmlTableType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTableType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Rules feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Rules feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addRulesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTableType_rules_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_rules_feature", "_UI_XhtmlTableType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTableType_Rules(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTableType_rules_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_rules_feature", "_UI_XhtmlTableType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTableType_Rules(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTableType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_space_feature", "_UI_XhtmlTableType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTableType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTableType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_space_feature", "_UI_XhtmlTableType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTableType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTableType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_style_feature", "_UI_XhtmlTableType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTableType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTableType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_style_feature", "_UI_XhtmlTableType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTableType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Summary feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Summary feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSummaryPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTableType_summary_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_summary_feature", "_UI_XhtmlTableType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTableType_Summary(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTableType_summary_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_summary_feature", "_UI_XhtmlTableType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTableType_Summary(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTableType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_title_feature", "_UI_XhtmlTableType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTableType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTableType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_title_feature", "_UI_XhtmlTableType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTableType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Width feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Width feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTableType_width_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_width_feature", "_UI_XhtmlTableType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTableType_Width(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTableType_width_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTableType_width_feature", "_UI_XhtmlTableType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTableType_Width(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -399,8 +260,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -412,35 +273,32 @@
 	}
 
 	/**
-	 * This returns XhtmlTableType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlTableType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlTableType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlTableType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlTableType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlTableType_type") :
-			getString("_UI_XhtmlTableType_type") + " " + label;
+		String label = ((XhtmlTableType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlTableType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlTableType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -448,85 +306,67 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlTableType.class)) {
-			case XhtmlPackage.XHTML_TABLE_TYPE__BORDER:
-			case XhtmlPackage.XHTML_TABLE_TYPE__CELLPADDING:
-			case XhtmlPackage.XHTML_TABLE_TYPE__CELLSPACING:
-			case XhtmlPackage.XHTML_TABLE_TYPE__CLASS:
-			case XhtmlPackage.XHTML_TABLE_TYPE__FRAME:
-			case XhtmlPackage.XHTML_TABLE_TYPE__ID:
-			case XhtmlPackage.XHTML_TABLE_TYPE__LANG:
-			case XhtmlPackage.XHTML_TABLE_TYPE__RULES:
-			case XhtmlPackage.XHTML_TABLE_TYPE__SPACE:
-			case XhtmlPackage.XHTML_TABLE_TYPE__STYLE:
-			case XhtmlPackage.XHTML_TABLE_TYPE__SUMMARY:
-			case XhtmlPackage.XHTML_TABLE_TYPE__TITLE:
-			case XhtmlPackage.XHTML_TABLE_TYPE__WIDTH:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__CAPTION:
-			case XhtmlPackage.XHTML_TABLE_TYPE__COL:
-			case XhtmlPackage.XHTML_TABLE_TYPE__COLGROUP:
-			case XhtmlPackage.XHTML_TABLE_TYPE__THEAD:
-			case XhtmlPackage.XHTML_TABLE_TYPE__TFOOT:
-			case XhtmlPackage.XHTML_TABLE_TYPE__TBODY:
-			case XhtmlPackage.XHTML_TABLE_TYPE__TR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__BORDER:
+		case XhtmlPackage.XHTML_TABLE_TYPE__CELLPADDING:
+		case XhtmlPackage.XHTML_TABLE_TYPE__CELLSPACING:
+		case XhtmlPackage.XHTML_TABLE_TYPE__CLASS:
+		case XhtmlPackage.XHTML_TABLE_TYPE__FRAME:
+		case XhtmlPackage.XHTML_TABLE_TYPE__ID:
+		case XhtmlPackage.XHTML_TABLE_TYPE__LANG:
+		case XhtmlPackage.XHTML_TABLE_TYPE__RULES:
+		case XhtmlPackage.XHTML_TABLE_TYPE__SPACE:
+		case XhtmlPackage.XHTML_TABLE_TYPE__STYLE:
+		case XhtmlPackage.XHTML_TABLE_TYPE__SUMMARY:
+		case XhtmlPackage.XHTML_TABLE_TYPE__TITLE:
+		case XhtmlPackage.XHTML_TABLE_TYPE__WIDTH:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__CAPTION:
+		case XhtmlPackage.XHTML_TABLE_TYPE__COL:
+		case XhtmlPackage.XHTML_TABLE_TYPE__COLGROUP:
+		case XhtmlPackage.XHTML_TABLE_TYPE__THEAD:
+		case XhtmlPackage.XHTML_TABLE_TYPE__TFOOT:
+		case XhtmlPackage.XHTML_TABLE_TYPE__TBODY:
+		case XhtmlPackage.XHTML_TABLE_TYPE__TR:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTableType_Caption(),
-				 XhtmlFactory.eINSTANCE.createXhtmlCaptionType()));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTableType_Caption(),
+				XhtmlFactory.eINSTANCE.createXhtmlCaptionType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTableType_Col(),
-				 XhtmlFactory.eINSTANCE.createXhtmlColType()));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTableType_Col(), XhtmlFactory.eINSTANCE.createXhtmlColType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTableType_Colgroup(),
-				 XhtmlFactory.eINSTANCE.createXhtmlColgroupType()));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTableType_Colgroup(),
+				XhtmlFactory.eINSTANCE.createXhtmlColgroupType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTableType_Thead(),
-				 XhtmlFactory.eINSTANCE.createXhtmlTheadType()));
+		newChildDescriptors
+				.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTableType_Thead(), XhtmlFactory.eINSTANCE.createXhtmlTheadType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTableType_Tfoot(),
-				 XhtmlFactory.eINSTANCE.createXhtmlTfootType()));
+		newChildDescriptors
+				.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTableType_Tfoot(), XhtmlFactory.eINSTANCE.createXhtmlTfootType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTableType_Tbody(),
-				 XhtmlFactory.eINSTANCE.createXhtmlTbodyType()));
+		newChildDescriptors
+				.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTableType_Tbody(), XhtmlFactory.eINSTANCE.createXhtmlTbodyType()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTableType_Tr(),
-				 XhtmlFactory.eINSTANCE.createXhtmlTrType()));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTableType_Tr(), XhtmlFactory.eINSTANCE.createXhtmlTrType()));
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTbodyTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTbodyTypeItemProvider.java
index ed3003a..b450079 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTbodyTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTbodyTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -38,23 +37,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlTbodyTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlTbodyTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlTbodyTypeItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +54,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,231 +78,131 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Align feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Align feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAlignPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTbodyType_align_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_align_feature", "_UI_XhtmlTbodyType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Align(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTbodyType_align_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_align_feature", "_UI_XhtmlTbodyType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Align(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Char feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Char feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTbodyType_char_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_char_feature", "_UI_XhtmlTbodyType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Char(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTbodyType_char_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_char_feature", "_UI_XhtmlTbodyType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Char(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Charoff feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Charoff feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharoffPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTbodyType_charoff_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_charoff_feature", "_UI_XhtmlTbodyType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Charoff(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTbodyType_charoff_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_charoff_feature", "_UI_XhtmlTbodyType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Charoff(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTbodyType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_class_feature", "_UI_XhtmlTbodyType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTbodyType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_class_feature", "_UI_XhtmlTbodyType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTbodyType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_id_feature", "_UI_XhtmlTbodyType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTbodyType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_id_feature", "_UI_XhtmlTbodyType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTbodyType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_lang_feature", "_UI_XhtmlTbodyType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTbodyType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_lang_feature", "_UI_XhtmlTbodyType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTbodyType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_space_feature", "_UI_XhtmlTbodyType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTbodyType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_space_feature", "_UI_XhtmlTbodyType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTbodyType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_style_feature", "_UI_XhtmlTbodyType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTbodyType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_style_feature", "_UI_XhtmlTbodyType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTbodyType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_title_feature", "_UI_XhtmlTbodyType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTbodyType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_title_feature", "_UI_XhtmlTbodyType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Valign feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Valign feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addValignPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTbodyType_valign_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_valign_feature", "_UI_XhtmlTbodyType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Valign(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTbodyType_valign_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTbodyType_valign_feature", "_UI_XhtmlTbodyType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Valign(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -324,8 +215,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -337,35 +228,32 @@
 	}
 
 	/**
-	 * This returns XhtmlTbodyType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlTbodyType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlTbodyType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlTbodyType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlTbodyType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlTbodyType_type") :
-			getString("_UI_XhtmlTbodyType_type") + " " + label;
+		String label = ((XhtmlTbodyType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlTbodyType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlTbodyType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -373,46 +261,41 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlTbodyType.class)) {
-			case XhtmlPackage.XHTML_TBODY_TYPE__ALIGN:
-			case XhtmlPackage.XHTML_TBODY_TYPE__CHAR:
-			case XhtmlPackage.XHTML_TBODY_TYPE__CHAROFF:
-			case XhtmlPackage.XHTML_TBODY_TYPE__CLASS:
-			case XhtmlPackage.XHTML_TBODY_TYPE__ID:
-			case XhtmlPackage.XHTML_TBODY_TYPE__LANG:
-			case XhtmlPackage.XHTML_TBODY_TYPE__SPACE:
-			case XhtmlPackage.XHTML_TBODY_TYPE__STYLE:
-			case XhtmlPackage.XHTML_TBODY_TYPE__TITLE:
-			case XhtmlPackage.XHTML_TBODY_TYPE__VALIGN:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__TR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__ALIGN:
+		case XhtmlPackage.XHTML_TBODY_TYPE__CHAR:
+		case XhtmlPackage.XHTML_TBODY_TYPE__CHAROFF:
+		case XhtmlPackage.XHTML_TBODY_TYPE__CLASS:
+		case XhtmlPackage.XHTML_TBODY_TYPE__ID:
+		case XhtmlPackage.XHTML_TBODY_TYPE__LANG:
+		case XhtmlPackage.XHTML_TBODY_TYPE__SPACE:
+		case XhtmlPackage.XHTML_TBODY_TYPE__STYLE:
+		case XhtmlPackage.XHTML_TBODY_TYPE__TITLE:
+		case XhtmlPackage.XHTML_TBODY_TYPE__VALIGN:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__TR:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Tr(),
-				 XhtmlFactory.eINSTANCE.createXhtmlTrType()));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTbodyType_Tr(), XhtmlFactory.eINSTANCE.createXhtmlTrType()));
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTdTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTdTypeItemProvider.java
index 9c593a0..9f59551 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTdTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTdTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlTdType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlTdTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlTdTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlTdTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -99,363 +90,203 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Abbr1 feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Abbr1 feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAbbr1PropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTdType_abbr1_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_abbr1_feature", "_UI_XhtmlTdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTdType_Abbr1(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTdType_abbr1_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_abbr1_feature", "_UI_XhtmlTdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Abbr1(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Align feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Align feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAlignPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTdType_align_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_align_feature", "_UI_XhtmlTdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTdType_Align(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTdType_align_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_align_feature", "_UI_XhtmlTdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Align(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Axis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Axis feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAxisPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTdType_axis_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_axis_feature", "_UI_XhtmlTdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTdType_Axis(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTdType_axis_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_axis_feature", "_UI_XhtmlTdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Axis(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Char feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Char feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTdType_char_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_char_feature", "_UI_XhtmlTdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTdType_Char(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTdType_char_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_char_feature", "_UI_XhtmlTdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Char(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Charoff feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Charoff feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharoffPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTdType_charoff_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_charoff_feature", "_UI_XhtmlTdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTdType_Charoff(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTdType_charoff_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_charoff_feature", "_UI_XhtmlTdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Charoff(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTdType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_class_feature", "_UI_XhtmlTdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTdType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTdType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_class_feature", "_UI_XhtmlTdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Colspan feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Colspan feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addColspanPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTdType_colspan_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_colspan_feature", "_UI_XhtmlTdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTdType_Colspan(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTdType_colspan_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_colspan_feature", "_UI_XhtmlTdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Colspan(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Headers feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Headers feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addHeadersPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTdType_headers_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_headers_feature", "_UI_XhtmlTdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTdType_Headers(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTdType_headers_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_headers_feature", "_UI_XhtmlTdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Headers(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTdType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_id_feature", "_UI_XhtmlTdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTdType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTdType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_id_feature", "_UI_XhtmlTdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTdType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_lang_feature", "_UI_XhtmlTdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTdType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTdType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_lang_feature", "_UI_XhtmlTdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Rowspan feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Rowspan feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addRowspanPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTdType_rowspan_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_rowspan_feature", "_UI_XhtmlTdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTdType_Rowspan(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTdType_rowspan_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_rowspan_feature", "_UI_XhtmlTdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Rowspan(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Scope feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Scope feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addScopePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTdType_scope_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_scope_feature", "_UI_XhtmlTdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTdType_Scope(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTdType_scope_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_scope_feature", "_UI_XhtmlTdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Scope(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTdType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_space_feature", "_UI_XhtmlTdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTdType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTdType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_space_feature", "_UI_XhtmlTdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTdType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_style_feature", "_UI_XhtmlTdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTdType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTdType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_style_feature", "_UI_XhtmlTdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTdType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_title_feature", "_UI_XhtmlTdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTdType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTdType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_title_feature", "_UI_XhtmlTdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Valign feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Valign feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addValignPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTdType_valign_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_valign_feature", "_UI_XhtmlTdType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTdType_Valign(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTdType_valign_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTdType_valign_feature", "_UI_XhtmlTdType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Valign(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -468,8 +299,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -481,35 +312,32 @@
 	}
 
 	/**
-	 * This returns XhtmlTdType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlTdType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlTdType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlTdType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlTdType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlTdType_type") :
-			getString("_UI_XhtmlTdType_type") + " " + label;
+		String label = ((XhtmlTdType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlTdType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlTdType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -517,355 +345,180 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlTdType.class)) {
-			case XhtmlPackage.XHTML_TD_TYPE__ABBR1:
-			case XhtmlPackage.XHTML_TD_TYPE__ALIGN:
-			case XhtmlPackage.XHTML_TD_TYPE__AXIS:
-			case XhtmlPackage.XHTML_TD_TYPE__CHAR:
-			case XhtmlPackage.XHTML_TD_TYPE__CHAROFF:
-			case XhtmlPackage.XHTML_TD_TYPE__CLASS:
-			case XhtmlPackage.XHTML_TD_TYPE__COLSPAN:
-			case XhtmlPackage.XHTML_TD_TYPE__HEADERS:
-			case XhtmlPackage.XHTML_TD_TYPE__ID:
-			case XhtmlPackage.XHTML_TD_TYPE__LANG:
-			case XhtmlPackage.XHTML_TD_TYPE__ROWSPAN:
-			case XhtmlPackage.XHTML_TD_TYPE__SCOPE:
-			case XhtmlPackage.XHTML_TD_TYPE__SPACE:
-			case XhtmlPackage.XHTML_TD_TYPE__STYLE:
-			case XhtmlPackage.XHTML_TD_TYPE__TITLE:
-			case XhtmlPackage.XHTML_TD_TYPE__VALIGN:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_TD_TYPE__ABBR1:
+		case XhtmlPackage.XHTML_TD_TYPE__ALIGN:
+		case XhtmlPackage.XHTML_TD_TYPE__AXIS:
+		case XhtmlPackage.XHTML_TD_TYPE__CHAR:
+		case XhtmlPackage.XHTML_TD_TYPE__CHAROFF:
+		case XhtmlPackage.XHTML_TD_TYPE__CLASS:
+		case XhtmlPackage.XHTML_TD_TYPE__COLSPAN:
+		case XhtmlPackage.XHTML_TD_TYPE__HEADERS:
+		case XhtmlPackage.XHTML_TD_TYPE__ID:
+		case XhtmlPackage.XHTML_TD_TYPE__LANG:
+		case XhtmlPackage.XHTML_TD_TYPE__ROWSPAN:
+		case XhtmlPackage.XHTML_TD_TYPE__SCOPE:
+		case XhtmlPackage.XHTML_TD_TYPE__SPACE:
+		case XhtmlPackage.XHTML_TD_TYPE__STYLE:
+		case XhtmlPackage.XHTML_TD_TYPE__TITLE:
+		case XhtmlPackage.XHTML_TD_TYPE__VALIGN:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_H1(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH1Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_H1(), XhtmlFactory.eINSTANCE.createXhtmlH1Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_H2(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH2Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_H2(), XhtmlFactory.eINSTANCE.createXhtmlH2Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_H3(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH3Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_H3(), XhtmlFactory.eINSTANCE.createXhtmlH3Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_H4(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH4Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_H4(), XhtmlFactory.eINSTANCE.createXhtmlH4Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_H5(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH5Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_H5(), XhtmlFactory.eINSTANCE.createXhtmlH5Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_H6(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH6Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_H6(), XhtmlFactory.eINSTANCE.createXhtmlH6Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Ul(),
-					 XhtmlFactory.eINSTANCE.createXhtmlUlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Ul(), XhtmlFactory.eINSTANCE.createXhtmlUlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Ol(),
-					 XhtmlFactory.eINSTANCE.createXhtmlOlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Ol(), XhtmlFactory.eINSTANCE.createXhtmlOlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Dl(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Dl(), XhtmlFactory.eINSTANCE.createXhtmlDlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_P(),
-					 XhtmlFactory.eINSTANCE.createXhtmlPType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_P(), XhtmlFactory.eINSTANCE.createXhtmlPType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Div(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDivType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Div(), XhtmlFactory.eINSTANCE.createXhtmlDivType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Pre(),
-					 XhtmlFactory.eINSTANCE.createXhtmlPreType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Pre(), XhtmlFactory.eINSTANCE.createXhtmlPreType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Blockquote(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBlockquoteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Blockquote(), XhtmlFactory.eINSTANCE.createXhtmlBlockquoteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Address(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAddressType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Address(), XhtmlFactory.eINSTANCE.createXhtmlAddressType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Hr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlHrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Hr(), XhtmlFactory.eINSTANCE.createXhtmlHrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Table(),
-					 XhtmlFactory.eINSTANCE.createXhtmlTableType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Table(), XhtmlFactory.eINSTANCE.createXhtmlTableType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTdType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTdType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTdType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -873,35 +526,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlTdType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTfootTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTfootTypeItemProvider.java
index 140b316..16e3558 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTfootTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTfootTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -38,23 +37,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlTfootTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlTfootTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlTfootTypeItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +54,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,231 +78,131 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Align feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Align feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAlignPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTfootType_align_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_align_feature", "_UI_XhtmlTfootType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTfootType_Align(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTfootType_align_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_align_feature", "_UI_XhtmlTfootType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTfootType_Align(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Char feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Char feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTfootType_char_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_char_feature", "_UI_XhtmlTfootType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTfootType_Char(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTfootType_char_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_char_feature", "_UI_XhtmlTfootType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTfootType_Char(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Charoff feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Charoff feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharoffPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTfootType_charoff_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_charoff_feature", "_UI_XhtmlTfootType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTfootType_Charoff(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTfootType_charoff_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_charoff_feature", "_UI_XhtmlTfootType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTfootType_Charoff(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTfootType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_class_feature", "_UI_XhtmlTfootType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTfootType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTfootType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_class_feature", "_UI_XhtmlTfootType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTfootType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTfootType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_id_feature", "_UI_XhtmlTfootType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTfootType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTfootType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_id_feature", "_UI_XhtmlTfootType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTfootType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTfootType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_lang_feature", "_UI_XhtmlTfootType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTfootType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTfootType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_lang_feature", "_UI_XhtmlTfootType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTfootType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTfootType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_space_feature", "_UI_XhtmlTfootType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTfootType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTfootType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_space_feature", "_UI_XhtmlTfootType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTfootType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTfootType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_style_feature", "_UI_XhtmlTfootType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTfootType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTfootType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_style_feature", "_UI_XhtmlTfootType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTfootType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTfootType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_title_feature", "_UI_XhtmlTfootType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTfootType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTfootType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_title_feature", "_UI_XhtmlTfootType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTfootType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Valign feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Valign feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addValignPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTfootType_valign_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_valign_feature", "_UI_XhtmlTfootType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTfootType_Valign(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTfootType_valign_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTfootType_valign_feature", "_UI_XhtmlTfootType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTfootType_Valign(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -324,8 +215,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -337,35 +228,32 @@
 	}
 
 	/**
-	 * This returns XhtmlTfootType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlTfootType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlTfootType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlTfootType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlTfootType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlTfootType_type") :
-			getString("_UI_XhtmlTfootType_type") + " " + label;
+		String label = ((XhtmlTfootType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlTfootType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlTfootType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -373,46 +261,41 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlTfootType.class)) {
-			case XhtmlPackage.XHTML_TFOOT_TYPE__ALIGN:
-			case XhtmlPackage.XHTML_TFOOT_TYPE__CHAR:
-			case XhtmlPackage.XHTML_TFOOT_TYPE__CHAROFF:
-			case XhtmlPackage.XHTML_TFOOT_TYPE__CLASS:
-			case XhtmlPackage.XHTML_TFOOT_TYPE__ID:
-			case XhtmlPackage.XHTML_TFOOT_TYPE__LANG:
-			case XhtmlPackage.XHTML_TFOOT_TYPE__SPACE:
-			case XhtmlPackage.XHTML_TFOOT_TYPE__STYLE:
-			case XhtmlPackage.XHTML_TFOOT_TYPE__TITLE:
-			case XhtmlPackage.XHTML_TFOOT_TYPE__VALIGN:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__TR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__ALIGN:
+		case XhtmlPackage.XHTML_TFOOT_TYPE__CHAR:
+		case XhtmlPackage.XHTML_TFOOT_TYPE__CHAROFF:
+		case XhtmlPackage.XHTML_TFOOT_TYPE__CLASS:
+		case XhtmlPackage.XHTML_TFOOT_TYPE__ID:
+		case XhtmlPackage.XHTML_TFOOT_TYPE__LANG:
+		case XhtmlPackage.XHTML_TFOOT_TYPE__SPACE:
+		case XhtmlPackage.XHTML_TFOOT_TYPE__STYLE:
+		case XhtmlPackage.XHTML_TFOOT_TYPE__TITLE:
+		case XhtmlPackage.XHTML_TFOOT_TYPE__VALIGN:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__TR:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTfootType_Tr(),
-				 XhtmlFactory.eINSTANCE.createXhtmlTrType()));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTfootType_Tr(), XhtmlFactory.eINSTANCE.createXhtmlTrType()));
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlThTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlThTypeItemProvider.java
index 861b05d..172a4da 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlThTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlThTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlThType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlThTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlThTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlThTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -99,363 +90,203 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Abbr1 feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Abbr1 feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAbbr1PropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlThType_abbr1_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_abbr1_feature", "_UI_XhtmlThType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlThType_Abbr1(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlThType_abbr1_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_abbr1_feature", "_UI_XhtmlThType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Abbr1(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Align feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Align feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAlignPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlThType_align_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_align_feature", "_UI_XhtmlThType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlThType_Align(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlThType_align_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_align_feature", "_UI_XhtmlThType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Align(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Axis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Axis feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAxisPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlThType_axis_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_axis_feature", "_UI_XhtmlThType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlThType_Axis(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlThType_axis_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_axis_feature", "_UI_XhtmlThType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Axis(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Char feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Char feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlThType_char_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_char_feature", "_UI_XhtmlThType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlThType_Char(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlThType_char_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_char_feature", "_UI_XhtmlThType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Char(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Charoff feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Charoff feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharoffPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlThType_charoff_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_charoff_feature", "_UI_XhtmlThType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlThType_Charoff(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlThType_charoff_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_charoff_feature", "_UI_XhtmlThType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Charoff(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlThType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_class_feature", "_UI_XhtmlThType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlThType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlThType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_class_feature", "_UI_XhtmlThType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Colspan feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Colspan feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addColspanPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlThType_colspan_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_colspan_feature", "_UI_XhtmlThType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlThType_Colspan(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlThType_colspan_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_colspan_feature", "_UI_XhtmlThType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Colspan(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Headers feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Headers feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addHeadersPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlThType_headers_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_headers_feature", "_UI_XhtmlThType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlThType_Headers(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlThType_headers_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_headers_feature", "_UI_XhtmlThType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Headers(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlThType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_id_feature", "_UI_XhtmlThType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlThType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlThType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_id_feature", "_UI_XhtmlThType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlThType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_lang_feature", "_UI_XhtmlThType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlThType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlThType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_lang_feature", "_UI_XhtmlThType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Rowspan feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Rowspan feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addRowspanPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlThType_rowspan_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_rowspan_feature", "_UI_XhtmlThType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlThType_Rowspan(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlThType_rowspan_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_rowspan_feature", "_UI_XhtmlThType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Rowspan(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Scope feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Scope feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addScopePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlThType_scope_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_scope_feature", "_UI_XhtmlThType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlThType_Scope(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlThType_scope_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_scope_feature", "_UI_XhtmlThType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Scope(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlThType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_space_feature", "_UI_XhtmlThType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlThType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlThType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_space_feature", "_UI_XhtmlThType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlThType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_style_feature", "_UI_XhtmlThType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlThType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlThType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_style_feature", "_UI_XhtmlThType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlThType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_title_feature", "_UI_XhtmlThType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlThType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlThType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_title_feature", "_UI_XhtmlThType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Valign feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Valign feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addValignPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlThType_valign_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_valign_feature", "_UI_XhtmlThType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlThType_Valign(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlThType_valign_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlThType_valign_feature", "_UI_XhtmlThType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Valign(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -468,8 +299,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -481,35 +312,32 @@
 	}
 
 	/**
-	 * This returns XhtmlThType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlThType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlThType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlThType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlThType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlThType_type") :
-			getString("_UI_XhtmlThType_type") + " " + label;
+		String label = ((XhtmlThType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlThType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlThType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -517,355 +345,180 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlThType.class)) {
-			case XhtmlPackage.XHTML_TH_TYPE__ABBR1:
-			case XhtmlPackage.XHTML_TH_TYPE__ALIGN:
-			case XhtmlPackage.XHTML_TH_TYPE__AXIS:
-			case XhtmlPackage.XHTML_TH_TYPE__CHAR:
-			case XhtmlPackage.XHTML_TH_TYPE__CHAROFF:
-			case XhtmlPackage.XHTML_TH_TYPE__CLASS:
-			case XhtmlPackage.XHTML_TH_TYPE__COLSPAN:
-			case XhtmlPackage.XHTML_TH_TYPE__HEADERS:
-			case XhtmlPackage.XHTML_TH_TYPE__ID:
-			case XhtmlPackage.XHTML_TH_TYPE__LANG:
-			case XhtmlPackage.XHTML_TH_TYPE__ROWSPAN:
-			case XhtmlPackage.XHTML_TH_TYPE__SCOPE:
-			case XhtmlPackage.XHTML_TH_TYPE__SPACE:
-			case XhtmlPackage.XHTML_TH_TYPE__STYLE:
-			case XhtmlPackage.XHTML_TH_TYPE__TITLE:
-			case XhtmlPackage.XHTML_TH_TYPE__VALIGN:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_TH_TYPE__ABBR1:
+		case XhtmlPackage.XHTML_TH_TYPE__ALIGN:
+		case XhtmlPackage.XHTML_TH_TYPE__AXIS:
+		case XhtmlPackage.XHTML_TH_TYPE__CHAR:
+		case XhtmlPackage.XHTML_TH_TYPE__CHAROFF:
+		case XhtmlPackage.XHTML_TH_TYPE__CLASS:
+		case XhtmlPackage.XHTML_TH_TYPE__COLSPAN:
+		case XhtmlPackage.XHTML_TH_TYPE__HEADERS:
+		case XhtmlPackage.XHTML_TH_TYPE__ID:
+		case XhtmlPackage.XHTML_TH_TYPE__LANG:
+		case XhtmlPackage.XHTML_TH_TYPE__ROWSPAN:
+		case XhtmlPackage.XHTML_TH_TYPE__SCOPE:
+		case XhtmlPackage.XHTML_TH_TYPE__SPACE:
+		case XhtmlPackage.XHTML_TH_TYPE__STYLE:
+		case XhtmlPackage.XHTML_TH_TYPE__TITLE:
+		case XhtmlPackage.XHTML_TH_TYPE__VALIGN:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_H1(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH1Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_H1(), XhtmlFactory.eINSTANCE.createXhtmlH1Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_H2(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH2Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_H2(), XhtmlFactory.eINSTANCE.createXhtmlH2Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_H3(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH3Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_H3(), XhtmlFactory.eINSTANCE.createXhtmlH3Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_H4(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH4Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_H4(), XhtmlFactory.eINSTANCE.createXhtmlH4Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_H5(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH5Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_H5(), XhtmlFactory.eINSTANCE.createXhtmlH5Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_H6(),
-					 XhtmlFactory.eINSTANCE.createXhtmlH6Type())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_H6(), XhtmlFactory.eINSTANCE.createXhtmlH6Type())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Ul(),
-					 XhtmlFactory.eINSTANCE.createXhtmlUlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Ul(), XhtmlFactory.eINSTANCE.createXhtmlUlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Ol(),
-					 XhtmlFactory.eINSTANCE.createXhtmlOlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Ol(), XhtmlFactory.eINSTANCE.createXhtmlOlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Dl(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDlType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Dl(), XhtmlFactory.eINSTANCE.createXhtmlDlType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_P(),
-					 XhtmlFactory.eINSTANCE.createXhtmlPType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_P(), XhtmlFactory.eINSTANCE.createXhtmlPType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Div(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDivType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Div(), XhtmlFactory.eINSTANCE.createXhtmlDivType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Pre(),
-					 XhtmlFactory.eINSTANCE.createXhtmlPreType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Pre(), XhtmlFactory.eINSTANCE.createXhtmlPreType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Blockquote(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBlockquoteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Blockquote(), XhtmlFactory.eINSTANCE.createXhtmlBlockquoteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Address(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAddressType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Address(), XhtmlFactory.eINSTANCE.createXhtmlAddressType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Hr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlHrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Hr(), XhtmlFactory.eINSTANCE.createXhtmlHrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Table(),
-					 XhtmlFactory.eINSTANCE.createXhtmlTableType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Table(), XhtmlFactory.eINSTANCE.createXhtmlTableType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlThType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlThType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlThType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -873,35 +526,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlThType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTheadTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTheadTypeItemProvider.java
index 71a169d..45159c1 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTheadTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTheadTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -38,23 +37,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlTheadTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlTheadTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlTheadTypeItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +54,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,231 +78,131 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Align feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Align feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAlignPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTheadType_align_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_align_feature", "_UI_XhtmlTheadType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTheadType_Align(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTheadType_align_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_align_feature", "_UI_XhtmlTheadType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTheadType_Align(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Char feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Char feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTheadType_char_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_char_feature", "_UI_XhtmlTheadType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTheadType_Char(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTheadType_char_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_char_feature", "_UI_XhtmlTheadType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTheadType_Char(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Charoff feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Charoff feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharoffPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTheadType_charoff_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_charoff_feature", "_UI_XhtmlTheadType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTheadType_Charoff(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTheadType_charoff_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_charoff_feature", "_UI_XhtmlTheadType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTheadType_Charoff(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTheadType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_class_feature", "_UI_XhtmlTheadType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTheadType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTheadType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_class_feature", "_UI_XhtmlTheadType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTheadType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTheadType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_id_feature", "_UI_XhtmlTheadType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTheadType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTheadType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_id_feature", "_UI_XhtmlTheadType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTheadType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTheadType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_lang_feature", "_UI_XhtmlTheadType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTheadType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTheadType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_lang_feature", "_UI_XhtmlTheadType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTheadType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTheadType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_space_feature", "_UI_XhtmlTheadType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTheadType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTheadType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_space_feature", "_UI_XhtmlTheadType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTheadType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTheadType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_style_feature", "_UI_XhtmlTheadType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTheadType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTheadType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_style_feature", "_UI_XhtmlTheadType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTheadType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTheadType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_title_feature", "_UI_XhtmlTheadType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTheadType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTheadType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_title_feature", "_UI_XhtmlTheadType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTheadType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Valign feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Valign feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addValignPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTheadType_valign_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_valign_feature", "_UI_XhtmlTheadType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTheadType_Valign(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTheadType_valign_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTheadType_valign_feature", "_UI_XhtmlTheadType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTheadType_Valign(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -324,8 +215,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -337,35 +228,32 @@
 	}
 
 	/**
-	 * This returns XhtmlTheadType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlTheadType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlTheadType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlTheadType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlTheadType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlTheadType_type") :
-			getString("_UI_XhtmlTheadType_type") + " " + label;
+		String label = ((XhtmlTheadType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlTheadType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlTheadType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -373,46 +261,41 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlTheadType.class)) {
-			case XhtmlPackage.XHTML_THEAD_TYPE__ALIGN:
-			case XhtmlPackage.XHTML_THEAD_TYPE__CHAR:
-			case XhtmlPackage.XHTML_THEAD_TYPE__CHAROFF:
-			case XhtmlPackage.XHTML_THEAD_TYPE__CLASS:
-			case XhtmlPackage.XHTML_THEAD_TYPE__ID:
-			case XhtmlPackage.XHTML_THEAD_TYPE__LANG:
-			case XhtmlPackage.XHTML_THEAD_TYPE__SPACE:
-			case XhtmlPackage.XHTML_THEAD_TYPE__STYLE:
-			case XhtmlPackage.XHTML_THEAD_TYPE__TITLE:
-			case XhtmlPackage.XHTML_THEAD_TYPE__VALIGN:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__TR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__ALIGN:
+		case XhtmlPackage.XHTML_THEAD_TYPE__CHAR:
+		case XhtmlPackage.XHTML_THEAD_TYPE__CHAROFF:
+		case XhtmlPackage.XHTML_THEAD_TYPE__CLASS:
+		case XhtmlPackage.XHTML_THEAD_TYPE__ID:
+		case XhtmlPackage.XHTML_THEAD_TYPE__LANG:
+		case XhtmlPackage.XHTML_THEAD_TYPE__SPACE:
+		case XhtmlPackage.XHTML_THEAD_TYPE__STYLE:
+		case XhtmlPackage.XHTML_THEAD_TYPE__TITLE:
+		case XhtmlPackage.XHTML_THEAD_TYPE__VALIGN:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__TR:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTheadType_Tr(),
-				 XhtmlFactory.eINSTANCE.createXhtmlTrType()));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTheadType_Tr(), XhtmlFactory.eINSTANCE.createXhtmlTrType()));
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTrTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTrTypeItemProvider.java
index d41b2e3..7820cc1 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTrTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlTrTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -40,23 +39,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlTrType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlTrTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlTrTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlTrTypeItemProvider(AdapterFactory adapterFactory) {
@@ -64,9 +56,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,231 +80,131 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Align feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Align feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAlignPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTrType_align_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_align_feature", "_UI_XhtmlTrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTrType_Align(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTrType_align_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_align_feature", "_UI_XhtmlTrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTrType_Align(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Char feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Char feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTrType_char_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_char_feature", "_UI_XhtmlTrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTrType_Char(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTrType_char_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_char_feature", "_UI_XhtmlTrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTrType_Char(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Charoff feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Charoff feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCharoffPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTrType_charoff_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_charoff_feature", "_UI_XhtmlTrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTrType_Charoff(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTrType_charoff_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_charoff_feature", "_UI_XhtmlTrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTrType_Charoff(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTrType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_class_feature", "_UI_XhtmlTrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTrType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTrType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_class_feature", "_UI_XhtmlTrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTrType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTrType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_id_feature", "_UI_XhtmlTrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTrType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTrType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_id_feature", "_UI_XhtmlTrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTrType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTrType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_lang_feature", "_UI_XhtmlTrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTrType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTrType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_lang_feature", "_UI_XhtmlTrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTrType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTrType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_space_feature", "_UI_XhtmlTrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTrType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTrType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_space_feature", "_UI_XhtmlTrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTrType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTrType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_style_feature", "_UI_XhtmlTrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTrType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTrType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_style_feature", "_UI_XhtmlTrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTrType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTrType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_title_feature", "_UI_XhtmlTrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTrType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTrType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_title_feature", "_UI_XhtmlTrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTrType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Valign feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Valign feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addValignPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlTrType_valign_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_valign_feature", "_UI_XhtmlTrType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlTrType_Valign(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlTrType_valign_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlTrType_valign_feature", "_UI_XhtmlTrType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlTrType_Valign(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -326,8 +217,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -339,35 +230,32 @@
 	}
 
 	/**
-	 * This returns XhtmlTrType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlTrType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlTrType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlTrType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlTrType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlTrType_type") :
-			getString("_UI_XhtmlTrType_type") + " " + label;
+		String label = ((XhtmlTrType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlTrType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlTrType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -375,55 +263,45 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlTrType.class)) {
-			case XhtmlPackage.XHTML_TR_TYPE__ALIGN:
-			case XhtmlPackage.XHTML_TR_TYPE__CHAR:
-			case XhtmlPackage.XHTML_TR_TYPE__CHAROFF:
-			case XhtmlPackage.XHTML_TR_TYPE__CLASS:
-			case XhtmlPackage.XHTML_TR_TYPE__ID:
-			case XhtmlPackage.XHTML_TR_TYPE__LANG:
-			case XhtmlPackage.XHTML_TR_TYPE__SPACE:
-			case XhtmlPackage.XHTML_TR_TYPE__STYLE:
-			case XhtmlPackage.XHTML_TR_TYPE__TITLE:
-			case XhtmlPackage.XHTML_TR_TYPE__VALIGN:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__GROUP:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_TR_TYPE__ALIGN:
+		case XhtmlPackage.XHTML_TR_TYPE__CHAR:
+		case XhtmlPackage.XHTML_TR_TYPE__CHAROFF:
+		case XhtmlPackage.XHTML_TR_TYPE__CLASS:
+		case XhtmlPackage.XHTML_TR_TYPE__ID:
+		case XhtmlPackage.XHTML_TR_TYPE__LANG:
+		case XhtmlPackage.XHTML_TR_TYPE__SPACE:
+		case XhtmlPackage.XHTML_TR_TYPE__STYLE:
+		case XhtmlPackage.XHTML_TR_TYPE__TITLE:
+		case XhtmlPackage.XHTML_TR_TYPE__VALIGN:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__GROUP:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTrType_Group(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTrType_Th(),
-					 XhtmlFactory.eINSTANCE.createXhtmlThType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTrType_Group(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTrType_Th(), XhtmlFactory.eINSTANCE.createXhtmlThType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlTrType_Group(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlTrType_Td(),
-					 XhtmlFactory.eINSTANCE.createXhtmlTdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlTrType_Group(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlTrType_Td(), XhtmlFactory.eINSTANCE.createXhtmlTdType())));
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlUlTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlUlTypeItemProvider.java
index de3086a..a70387a 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlUlTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlUlTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -38,23 +37,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlUlType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlUlTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlUlTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlUlTypeItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +54,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -83,143 +74,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlUlType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlUlType_class_feature", "_UI_XhtmlUlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlUlType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlUlType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlUlType_class_feature", "_UI_XhtmlUlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlUlType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlUlType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlUlType_id_feature", "_UI_XhtmlUlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlUlType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlUlType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlUlType_id_feature", "_UI_XhtmlUlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlUlType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlUlType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlUlType_lang_feature", "_UI_XhtmlUlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlUlType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlUlType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlUlType_lang_feature", "_UI_XhtmlUlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlUlType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlUlType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlUlType_space_feature", "_UI_XhtmlUlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlUlType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlUlType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlUlType_space_feature", "_UI_XhtmlUlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlUlType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlUlType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlUlType_style_feature", "_UI_XhtmlUlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlUlType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlUlType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlUlType_style_feature", "_UI_XhtmlUlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlUlType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlUlType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlUlType_title_feature", "_UI_XhtmlUlType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlUlType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlUlType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlUlType_title_feature", "_UI_XhtmlUlType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlUlType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -232,8 +163,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -245,35 +176,32 @@
 	}
 
 	/**
-	 * This returns XhtmlUlType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlUlType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlUlType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlUlType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlUlType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlUlType_type") :
-			getString("_UI_XhtmlUlType_type") + " " + label;
+		String label = ((XhtmlUlType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlUlType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlUlType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -281,42 +209,37 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlUlType.class)) {
-			case XhtmlPackage.XHTML_UL_TYPE__CLASS:
-			case XhtmlPackage.XHTML_UL_TYPE__ID:
-			case XhtmlPackage.XHTML_UL_TYPE__LANG:
-			case XhtmlPackage.XHTML_UL_TYPE__SPACE:
-			case XhtmlPackage.XHTML_UL_TYPE__STYLE:
-			case XhtmlPackage.XHTML_UL_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_UL_TYPE__LI:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_UL_TYPE__CLASS:
+		case XhtmlPackage.XHTML_UL_TYPE__ID:
+		case XhtmlPackage.XHTML_UL_TYPE__LANG:
+		case XhtmlPackage.XHTML_UL_TYPE__SPACE:
+		case XhtmlPackage.XHTML_UL_TYPE__STYLE:
+		case XhtmlPackage.XHTML_UL_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_UL_TYPE__LI:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlUlType_Li(),
-				 XhtmlFactory.eINSTANCE.createXhtmlLiType()));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlUlType_Li(), XhtmlFactory.eINSTANCE.createXhtmlLiType()));
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlVarTypeItemProvider.java b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlVarTypeItemProvider.java
index e267c47..337d2dd 100644
--- a/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlVarTypeItemProvider.java
+++ b/org.eclipse.rmf.reqif10.xhtml.edit/src/org/eclipse/rmf/reqif10/xhtml/provider/XhtmlVarTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  */
 package org.eclipse.rmf.reqif10.xhtml.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,23 +43,16 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class XhtmlVarTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+public class XhtmlVarTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlVarTypeItemProvider(AdapterFactory adapterFactory) {
@@ -68,9 +60,8 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,143 +80,83 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Class feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlVarType_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlVarType_class_feature", "_UI_XhtmlVarType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlVarType_Class(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlVarType_class_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlVarType_class_feature", "_UI_XhtmlVarType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlVarType_Class(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlVarType_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlVarType_id_feature", "_UI_XhtmlVarType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlVarType_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlVarType_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlVarType_id_feature", "_UI_XhtmlVarType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlVarType_Id(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Lang feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlVarType_lang_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlVarType_lang_feature", "_UI_XhtmlVarType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlVarType_Lang(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlVarType_lang_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlVarType_lang_feature", "_UI_XhtmlVarType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlVarType_Lang(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Space feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlVarType_space_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlVarType_space_feature", "_UI_XhtmlVarType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlVarType_Space(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlVarType_space_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlVarType_space_feature", "_UI_XhtmlVarType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlVarType_Space(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Style feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlVarType_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlVarType_style_feature", "_UI_XhtmlVarType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlVarType_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlVarType_style_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlVarType_style_feature", "_UI_XhtmlVarType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlVarType_Style(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_XhtmlVarType_title_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_XhtmlVarType_title_feature", "_UI_XhtmlVarType_type"),
-				 XhtmlPackage.eINSTANCE.getXhtmlVarType_Title(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_XhtmlVarType_title_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_XhtmlVarType_title_feature", "_UI_XhtmlVarType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				XhtmlPackage.eINSTANCE.getXhtmlVarType_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,35 +182,32 @@
 	}
 
 	/**
-	 * This returns XhtmlVarType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns XhtmlVarType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlVarType"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XhtmlVarType")); //$NON-NLS-1$
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((XhtmlVarType)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_XhtmlVarType_type") :
-			getString("_UI_XhtmlVarType_type") + " " + label;
+		String label = ((XhtmlVarType) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_XhtmlVarType_type") : //$NON-NLS-1$
+				getString("_UI_XhtmlVarType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,233 +215,122 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(XhtmlVarType.class)) {
-			case XhtmlPackage.XHTML_VAR_TYPE__CLASS:
-			case XhtmlPackage.XHTML_VAR_TYPE__ID:
-			case XhtmlPackage.XHTML_VAR_TYPE__LANG:
-			case XhtmlPackage.XHTML_VAR_TYPE__SPACE:
-			case XhtmlPackage.XHTML_VAR_TYPE__STYLE:
-			case XhtmlPackage.XHTML_VAR_TYPE__TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__MIXED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		case XhtmlPackage.XHTML_VAR_TYPE__CLASS:
+		case XhtmlPackage.XHTML_VAR_TYPE__ID:
+		case XhtmlPackage.XHTML_VAR_TYPE__LANG:
+		case XhtmlPackage.XHTML_VAR_TYPE__SPACE:
+		case XhtmlPackage.XHTML_VAR_TYPE__STYLE:
+		case XhtmlPackage.XHTML_VAR_TYPE__TITLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__MIXED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-					 XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
+		newChildDescriptors.add(createChildParameter(
+				XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+						XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-					 "")));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, ""))); //$NON-NLS-1$
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Br(),
-					 XhtmlFactory.eINSTANCE.createXhtmlBrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Br(), XhtmlFactory.eINSTANCE.createXhtmlBrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Span(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Span(), XhtmlFactory.eINSTANCE.createXhtmlSpanType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Em(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEmType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Em(), XhtmlFactory.eINSTANCE.createXhtmlEmType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Strong(),
-					 XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Strong(), XhtmlFactory.eINSTANCE.createXhtmlStrongType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Dfn(),
-					 XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Dfn(), XhtmlFactory.eINSTANCE.createXhtmlDfnType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Code(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Code(), XhtmlFactory.eINSTANCE.createXhtmlCodeType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Samp(),
-					 XhtmlFactory.eINSTANCE.createXhtmlSampType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Samp(), XhtmlFactory.eINSTANCE.createXhtmlSampType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Kbd(),
-					 XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Kbd(), XhtmlFactory.eINSTANCE.createXhtmlKbdType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Var(),
-					 XhtmlFactory.eINSTANCE.createXhtmlVarType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Var(), XhtmlFactory.eINSTANCE.createXhtmlVarType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Cite(),
-					 XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Cite(), XhtmlFactory.eINSTANCE.createXhtmlCiteType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Abbr(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Abbr(), XhtmlFactory.eINSTANCE.createXhtmlAbbrType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Acronym(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Acronym(), XhtmlFactory.eINSTANCE.createXhtmlAcronymType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Q(),
-					 XhtmlFactory.eINSTANCE.createXhtmlQType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Q(), XhtmlFactory.eINSTANCE.createXhtmlQType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Tt(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Tt(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_I(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_I(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_B(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_B(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Big(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Big(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Small(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Small(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Sub(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Sub(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Sup(),
-					 XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Sup(), XhtmlFactory.eINSTANCE.createXhtmlInlPresType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_A(),
-					 XhtmlFactory.eINSTANCE.createXhtmlAType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_A(), XhtmlFactory.eINSTANCE.createXhtmlAType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Object(),
-					 XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Object(), XhtmlFactory.eINSTANCE.createXhtmlObjectType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Ins(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Ins(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
-				 FeatureMapUtil.createEntry
-					(XhtmlPackage.eINSTANCE.getXhtmlVarType_Del(),
-					 XhtmlFactory.eINSTANCE.createXhtmlEditType())));
+		newChildDescriptors.add(createChildParameter(XhtmlPackage.eINSTANCE.getXhtmlVarType_Mixed(),
+				FeatureMapUtil.createEntry(XhtmlPackage.eINSTANCE.getXhtmlVarType_Del(), XhtmlFactory.eINSTANCE.createXhtmlEditType())));
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,35 +338,28 @@
 		Object childFeature = feature;
 		Object childObject = child;
 
-		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-			FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+		if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		boolean qualify =
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_Tt() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_I() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_B() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_Big() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_Small() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_Sub() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_Sup() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_Ins() ||
-			childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_Del();
+		boolean qualify = childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_Tt() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_I()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_B() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_Big()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_Small() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_Sub()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_Sup() || childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_Ins()
+				|| childFeature == XhtmlPackage.eINSTANCE.getXhtmlVarType_Del();
 
 		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/org.eclipse.rmf.reqif10.xhtml/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.xhtml/META-INF/MANIFEST.MF
index af042a5..bbc8b9a 100644
--- a/org.eclipse.rmf.reqif10.xhtml/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.xhtml/META-INF/MANIFEST.MF
@@ -2,18 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rmf.reqif10.xhtml;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.rmf.reqif10.datatypes,
- org.eclipse.rmf.reqif10.datatypes.impl,
- org.eclipse.rmf.reqif10.datatypes.util,
- org.eclipse.rmf.reqif10.xhtml,
- org.eclipse.rmf.reqif10.xhtml.impl,
- org.eclipse.rmf.reqif10.xhtml.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport
+Export-Package: org.eclipse.rmf.reqif10.datatypes,org.eclipse.rmf.reqi
+ f10.datatypes.impl,org.eclipse.rmf.reqif10.datatypes.util,org.eclipse
+ .rmf.reqif10.xhtml,org.eclipse.rmf.reqif10.xhtml.impl,org.eclipse.rmf
+ .reqif10.xhtml.util
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.emf.ecore;visibility:=reexport;bundle-version="2.7.0",
+ org.eclipse.emf.ecore.xmi;visibility:=reexport;bundle-version="2.7.0"
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.rmf.reqif10.xhtml/about.html b/org.eclipse.rmf.reqif10.xhtml/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.xhtml/about.html
+++ b/org.eclipse.rmf.reqif10.xhtml/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.xhtml/build.properties b/org.eclipse.rmf.reqif10.xhtml/build.properties
index 8f5d00a..18d6e1e 100644
--- a/org.eclipse.rmf.reqif10.xhtml/build.properties
+++ b/org.eclipse.rmf.reqif10.xhtml/build.properties
@@ -1,13 +1,13 @@
-# Copyright (c) 2012 itemis AG.
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
-# 
+#
 # Contributors:
-#     Mark Broerkens - initial API and implementation
-# 
-
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 bin.includes = .,\
                model/,\
                META-INF/,\
diff --git a/org.eclipse.rmf.reqif10.xhtml/epl-v10.html b/org.eclipse.rmf.reqif10.xhtml/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.reqif10.xhtml/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.xhtml/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.xhtml/model/xhtml.genmodel b/org.eclipse.rmf.reqif10.xhtml/model/xhtml.genmodel
index bb20d41..ff66e0f 100644
--- a/org.eclipse.rmf.reqif10.xhtml/model/xhtml.genmodel
+++ b/org.eclipse.rmf.reqif10.xhtml/model/xhtml.genmodel
@@ -1,12 +1,13 @@
 <?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" copyrightText="Copyright (c) 2013 itemis AG.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA;    Mark Broerkens - initial API and implementation&#xA;"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 itemis AG and others.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA;    Mark Broerkens - initial API and implementation&#xA;"
     modelDirectory="/org.eclipse.rmf.reqif10.xhtml/src" editDirectory="/org.eclipse.rmf.reqif10.xhtml.edit/src"
     editorDirectory="" modelPluginID="org.eclipse.rmf.reqif10.xhtml" modelName="Xhtml"
-    modelPluginClass="" editorPluginClass="" testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"
+    modelPluginClass="" editorPluginClass="" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl"
+    testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"
     complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.rmf.reqif10.xhtml.edit"
     editorPluginID="org.eclipse.rmf.reqif10.xhtml.editor" testsPluginID="org.eclipse.rmf.reqif10.xhtml.editor"
-    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/XMLNamespace.genmodel#//namespace">
+    runtimeVersion="2.7" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/XMLNamespace.genmodel#//namespace">
   <foreignModel>xhtml.ecore</foreignModel>
   <foreignModel>datatypes.ecore</foreignModel>
   <genPackages prefix="Xhtml" basePackage="org.eclipse.rmf.reqif10" resource="XML"
diff --git a/org.eclipse.rmf.reqif10.xhtml/notice.html b/org.eclipse.rmf.reqif10.xhtml/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.reqif10.xhtml/notice.html
+++ b/org.eclipse.rmf.reqif10.xhtml/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.xhtml/plugin.properties b/org.eclipse.rmf.reqif10.xhtml/plugin.properties
index b2418c0..37fb7fb 100644
--- a/org.eclipse.rmf.reqif10.xhtml/plugin.properties
+++ b/org.eclipse.rmf.reqif10.xhtml/plugin.properties
@@ -1,11 +1,13 @@
-# Copyright (c) 2012 itemis GmbH.
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # Contributors:
-#     Mark Broerkens - initial API and implementation
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 
 pluginName = RMF Core ReqIF Xhtml Model (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/org.eclipse.rmf.reqif10.xhtml/plugin.xml b/org.eclipse.rmf.reqif10.xhtml/plugin.xml
index 146fc9d..2386793 100644
--- a/org.eclipse.rmf.reqif10.xhtml/plugin.xml
+++ b/org.eclipse.rmf.reqif10.xhtml/plugin.xml
@@ -38,11 +38,4 @@
             genModel="model/xhtml.genmodel"/>
    </extension>
 
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated xhtml -->
-      <parser
-            type="datatypes"
-            class="org.eclipse.rmf.reqif10.datatypes.util.DatatypesResourceFactoryImpl"/>
-   </extension>
-
 </plugin>
diff --git a/org.eclipse.rmf.reqif10.xhtml/pom.xml b/org.eclipse.rmf.reqif10.xhtml/pom.xml
index 0116aff..951a6e8 100644
--- a/org.eclipse.rmf.reqif10.xhtml/pom.xml
+++ b/org.eclipse.rmf.reqif10.xhtml/pom.xml
@@ -19,31 +19,13 @@
 	<parent>
 		<groupId>org.eclipse.rmf</groupId>
 		<artifactId>org.eclipse.rmf.releng</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.10.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.rmf.reqif10.xhtml</artifactId>
-	<version>0.9.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.rmf.plugins</groupId>
 	<properties>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   	</properties>
- 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>plugin-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/DatatypesFactory.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/DatatypesFactory.java
index d877fc5..7c2f4b2 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/DatatypesFactory.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/DatatypesFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,29 +14,26 @@
 import org.eclipse.emf.ecore.EFactory;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
+ * the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.datatypes.DatatypesPackage
  * @generated
  */
 public interface DatatypesFactory extends EFactory {
 	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	DatatypesFactory eINSTANCE = org.eclipse.rmf.reqif10.datatypes.impl.DatatypesFactoryImpl.init();
 
 	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
 	DatatypesPackage getDatatypesPackage();
 
-} //DatatypesFactory
+} // DatatypesFactory
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/DatatypesPackage.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/DatatypesPackage.java
index be6c5b0..6fb226f 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/DatatypesPackage.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/DatatypesPackage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,70 +16,54 @@
 import org.eclipse.emf.ecore.EPackage;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
+ * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
+ * <!-- end-user-doc --> <!-- begin-model-doc --> XHTML Datatypes This is the XML Schema datatypes module for XHTML
+ * Defines containers for the XHTML datatypes, many of these imported from other specifications and standards. $Id:
+ * xhtml-datatypes-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $ <!-- end-model-doc -->
  * 
- *           XHTML Datatypes
- *           This is the XML Schema datatypes module for XHTML
- *           
- *           Defines containers for the XHTML datatypes, many of
- *           these imported from other specifications and standards.
- *           
- *           $Id: xhtml-datatypes-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $
- *         
- * 
- * 
- * <!-- end-model-doc -->
  * @see org.eclipse.rmf.reqif10.datatypes.DatatypesFactory
  * @model kind="package"
  * @generated
  */
 public interface DatatypesPackage extends EPackage {
 	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	String eNAME = "datatypes";
+	String eNAME = "datatypes"; //$NON-NLS-1$
 
 	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	String eNS_URI = "http://www.w3.org/1999/xhtml/datatypes/";
+	String eNS_URI = "http://www.w3.org/1999/xhtml/datatypes/"; //$NON-NLS-1$
 
 	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	String eNS_PREFIX = "datatypes";
+	String eNS_PREFIX = "datatypes"; //$NON-NLS-1$
 
 	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	DatatypesPackage eINSTANCE = org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0 <em>Frame Target Member0</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0
+	 * <em>Frame Target Member0</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getFrameTargetMember0()
 	 * @generated
@@ -87,9 +71,8 @@
 	int FRAME_TARGET_MEMBER0 = 0;
 
 	/**
-	 * The meta object id for the '<em>CDATA</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>CDATA</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getCDATA()
 	 * @generated
@@ -97,9 +80,8 @@
 	int CDATA = 1;
 
 	/**
-	 * The meta object id for the '<em>Character</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Character</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getCharacter()
 	 * @generated
@@ -107,9 +89,8 @@
 	int CHARACTER = 2;
 
 	/**
-	 * The meta object id for the '<em>Charset</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Charset</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getCharset()
 	 * @generated
@@ -117,9 +98,8 @@
 	int CHARSET = 3;
 
 	/**
-	 * The meta object id for the '<em>Charsets</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Charsets</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.util.List
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getCharsets()
 	 * @generated
@@ -127,9 +107,8 @@
 	int CHARSETS = 4;
 
 	/**
-	 * The meta object id for the '<em>Color</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Color</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getColor()
 	 * @generated
@@ -137,9 +116,8 @@
 	int COLOR = 5;
 
 	/**
-	 * The meta object id for the '<em>Color Member1</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Color Member1</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getColorMember1()
 	 * @generated
@@ -147,9 +125,8 @@
 	int COLOR_MEMBER1 = 6;
 
 	/**
-	 * The meta object id for the '<em>Content Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Content Type</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getContentType()
 	 * @generated
@@ -157,9 +134,8 @@
 	int CONTENT_TYPE = 7;
 
 	/**
-	 * The meta object id for the '<em>Content Types</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Content Types</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getContentTypes()
 	 * @generated
@@ -167,9 +143,8 @@
 	int CONTENT_TYPES = 8;
 
 	/**
-	 * The meta object id for the '<em>CURIE</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>CURIE</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getCURIE()
 	 * @generated
@@ -177,9 +152,8 @@
 	int CURIE = 9;
 
 	/**
-	 * The meta object id for the '<em>CURI Es</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>CURI Es</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.util.List
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getCURIEs()
 	 * @generated
@@ -187,9 +161,8 @@
 	int CURI_ES = 10;
 
 	/**
-	 * The meta object id for the '<em>Datetime</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Datetime</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see javax.xml.datatype.XMLGregorianCalendar
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getDatetime()
 	 * @generated
@@ -197,9 +170,8 @@
 	int DATETIME = 11;
 
 	/**
-	 * The meta object id for the '<em>FPI</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>FPI</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getFPI()
 	 * @generated
@@ -207,9 +179,8 @@
 	int FPI = 12;
 
 	/**
-	 * The meta object id for the '<em>Frame Target</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Frame Target</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.Object
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getFrameTarget()
 	 * @generated
@@ -217,9 +188,9 @@
 	int FRAME_TARGET = 13;
 
 	/**
-	 * The meta object id for the '<em>Frame Target Member0 Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Frame Target Member0 Object</em>' data type. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getFrameTargetMember0Object()
 	 * @generated
@@ -227,9 +198,9 @@
 	int FRAME_TARGET_MEMBER0_OBJECT = 14;
 
 	/**
-	 * The meta object id for the '<em>Frame Target Member1</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Frame Target Member1</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getFrameTargetMember1()
 	 * @generated
@@ -237,9 +208,8 @@
 	int FRAME_TARGET_MEMBER1 = 15;
 
 	/**
-	 * The meta object id for the '<em>Language Code</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Language Code</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getLanguageCode()
 	 * @generated
@@ -247,9 +217,8 @@
 	int LANGUAGE_CODE = 16;
 
 	/**
-	 * The meta object id for the '<em>Language Codes</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Language Codes</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getLanguageCodes()
 	 * @generated
@@ -257,9 +226,8 @@
 	int LANGUAGE_CODES = 17;
 
 	/**
-	 * The meta object id for the '<em>Length</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Length</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.Object
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getLength()
 	 * @generated
@@ -267,9 +235,8 @@
 	int LENGTH = 18;
 
 	/**
-	 * The meta object id for the '<em>Length Member1</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Length Member1</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getLengthMember1()
 	 * @generated
@@ -277,9 +244,8 @@
 	int LENGTH_MEMBER1 = 19;
 
 	/**
-	 * The meta object id for the '<em>Link Types</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Link Types</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.util.List
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getLinkTypes()
 	 * @generated
@@ -287,9 +253,8 @@
 	int LINK_TYPES = 20;
 
 	/**
-	 * The meta object id for the '<em>Media Desc</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Media Desc</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getMediaDesc()
 	 * @generated
@@ -297,9 +262,8 @@
 	int MEDIA_DESC = 21;
 
 	/**
-	 * The meta object id for the '<em>Multi Length</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Multi Length</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.Object
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getMultiLength()
 	 * @generated
@@ -307,9 +271,9 @@
 	int MULTI_LENGTH = 22;
 
 	/**
-	 * The meta object id for the '<em>Multi Length Member1</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Multi Length Member1</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getMultiLengthMember1()
 	 * @generated
@@ -317,9 +281,8 @@
 	int MULTI_LENGTH_MEMBER1 = 23;
 
 	/**
-	 * The meta object id for the '<em>Multi Lengths</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Multi Lengths</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getMultiLengths()
 	 * @generated
@@ -327,9 +290,8 @@
 	int MULTI_LENGTHS = 24;
 
 	/**
-	 * The meta object id for the '<em>Number</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Number</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.math.BigInteger
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getNumber()
 	 * @generated
@@ -337,9 +299,8 @@
 	int NUMBER = 25;
 
 	/**
-	 * The meta object id for the '<em>Pixels</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Pixels</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.math.BigInteger
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getPixels()
 	 * @generated
@@ -347,9 +308,8 @@
 	int PIXELS = 26;
 
 	/**
-	 * The meta object id for the '<em>Safe CURIE</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Safe CURIE</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getSafeCURIE()
 	 * @generated
@@ -357,9 +317,8 @@
 	int SAFE_CURIE = 27;
 
 	/**
-	 * The meta object id for the '<em>Safe CURI Es</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Safe CURI Es</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.util.List
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getSafeCURIEs()
 	 * @generated
@@ -367,9 +326,8 @@
 	int SAFE_CURI_ES = 28;
 
 	/**
-	 * The meta object id for the '<em>Script</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Script</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getScript()
 	 * @generated
@@ -377,9 +335,8 @@
 	int SCRIPT = 29;
 
 	/**
-	 * The meta object id for the '<em>Text</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Text</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getText()
 	 * @generated
@@ -387,9 +344,8 @@
 	int TEXT = 30;
 
 	/**
-	 * The meta object id for the '<em>URI</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>URI</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getURI()
 	 * @generated
@@ -397,9 +353,8 @@
 	int URI = 31;
 
 	/**
-	 * The meta object id for the '<em>UR Ior Safe CURIE</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>UR Ior Safe CURIE</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getURIorSafeCURIE()
 	 * @generated
@@ -407,9 +362,9 @@
 	int UR_IOR_SAFE_CURIE = 32;
 
 	/**
-	 * The meta object id for the '<em>UR Ior Safe CURI Es</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>UR Ior Safe CURI Es</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see java.util.List
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getURIorSafeCURIEs()
 	 * @generated
@@ -417,9 +372,8 @@
 	int UR_IOR_SAFE_CURI_ES = 33;
 
 	/**
-	 * The meta object id for the '<em>URIREF</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>URIREF</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getURIREF()
 	 * @generated
@@ -427,20 +381,18 @@
 	int URIREF = 34;
 
 	/**
-	 * The meta object id for the '<em>UR Is</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>UR Is</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.util.List
 	 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getURIs()
 	 * @generated
 	 */
 	int UR_IS = 35;
 
-
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0 <em>Frame Target Member0</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum '{@link org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0
+	 * <em>Frame Target Member0</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Frame Target Member0</em>'.
 	 * @see org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0
 	 * @generated
@@ -448,9 +400,9 @@
 	EEnum getFrameTargetMember0();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>CDATA</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>CDATA</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>CDATA</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -460,9 +412,9 @@
 	EDataType getCDATA();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Character</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Character</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Character</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -472,9 +424,9 @@
 	EDataType getCharacter();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Charset</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Charset</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Charset</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -484,45 +436,44 @@
 	EDataType getCharset();
 
 	/**
-	 * Returns the meta object for data type '{@link java.util.List <em>Charsets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.util.List <em>Charsets</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Charsets</em>'.
 	 * @see java.util.List
-	 * @model instanceClass="java.util.List"
-	 *        extendedMetaData="name='Charsets' itemType='Charset'"
+	 * @model instanceClass="java.util.List" extendedMetaData="name='Charsets' itemType='Charset'"
 	 * @generated
 	 */
 	EDataType getCharsets();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Color</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Color</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Color</em>'.
 	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Color' memberTypes='http://www.eclipse.org/emf/2003/XMLType#NMTOKEN Color_._member_._1'"
+	 * @model instanceClass="java.lang.String" extendedMetaData=
+	 *        "name='Color' memberTypes='http://www.eclipse.org/emf/2003/XMLType#NMTOKEN Color_._member_._1'"
 	 * @generated
 	 */
 	EDataType getColor();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Color Member1</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Color Member1</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Color Member1</em>'.
 	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Color_._member_._1' baseType='http://www.eclipse.org/emf/2003/XMLType#token' pattern='#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?'"
+	 * @model instanceClass="java.lang.String" extendedMetaData=
+	 *        "name='Color_._member_._1' baseType='http://www.eclipse.org/emf/2003/XMLType#token' pattern='#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?'"
 	 * @generated
 	 */
 	EDataType getColorMember1();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Content Type</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Content Type</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Content Type</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -532,9 +483,9 @@
 	EDataType getContentType();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Content Types</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Content Types</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Content Types</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -544,33 +495,32 @@
 	EDataType getContentTypes();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>CURIE</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>CURIE</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>CURIE</em>'.
 	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='CURIE' baseType='http://www.eclipse.org/emf/2003/XMLType#string' minLength='1' pattern='(([\\i-[:]][\\c-[:]]*)?:)?.+'"
+	 * @model instanceClass="java.lang.String" extendedMetaData=
+	 *        "name='CURIE' baseType='http://www.eclipse.org/emf/2003/XMLType#string' minLength='1' pattern='(([\\i-[:]][\\c-[:]]*)?:)?.+'"
 	 * @generated
 	 */
 	EDataType getCURIE();
 
 	/**
-	 * Returns the meta object for data type '{@link java.util.List <em>CURI Es</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.util.List <em>CURI Es</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>CURI Es</em>'.
 	 * @see java.util.List
-	 * @model instanceClass="java.util.List"
-	 *        extendedMetaData="name='CURIEs' itemType='CURIE'"
+	 * @model instanceClass="java.util.List" extendedMetaData="name='CURIEs' itemType='CURIE'"
 	 * @generated
 	 */
 	EDataType getCURIEs();
 
 	/**
-	 * Returns the meta object for data type '{@link javax.xml.datatype.XMLGregorianCalendar <em>Datetime</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link javax.xml.datatype.XMLGregorianCalendar <em>Datetime</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Datetime</em>'.
 	 * @see javax.xml.datatype.XMLGregorianCalendar
 	 * @model instanceClass="javax.xml.datatype.XMLGregorianCalendar"
@@ -580,9 +530,9 @@
 	EDataType getDatetime();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>FPI</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>FPI</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>FPI</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -592,9 +542,9 @@
 	EDataType getFPI();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.Object <em>Frame Target</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.Object <em>Frame Target</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Frame Target</em>'.
 	 * @see java.lang.Object
 	 * @model instanceClass="java.lang.Object"
@@ -604,9 +554,9 @@
 	EDataType getFrameTarget();
 
 	/**
-	 * Returns the meta object for data type '{@link org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0 <em>Frame Target Member0 Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0
+	 * <em>Frame Target Member0 Object</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Frame Target Member0 Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0
 	 * @model instanceClass="org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0"
@@ -616,21 +566,21 @@
 	EDataType getFrameTargetMember0Object();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Frame Target Member1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Frame Target Member1</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Frame Target Member1</em>'.
 	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='FrameTarget_._member_._1' baseType='http://www.eclipse.org/emf/2003/XMLType#string' pattern='[a-zA-Z].*'"
+	 * @model instanceClass="java.lang.String" extendedMetaData=
+	 *        "name='FrameTarget_._member_._1' baseType='http://www.eclipse.org/emf/2003/XMLType#string' pattern='[a-zA-Z].*'"
 	 * @generated
 	 */
 	EDataType getFrameTargetMember1();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Language Code</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Language Code</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Language Code</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -640,9 +590,9 @@
 	EDataType getLanguageCode();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Language Codes</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Language Codes</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Language Codes</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -652,33 +602,33 @@
 	EDataType getLanguageCodes();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.Object <em>Length</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.Object <em>Length</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Length</em>'.
 	 * @see java.lang.Object
-	 * @model instanceClass="java.lang.Object"
-	 *        extendedMetaData="name='Length' memberTypes='http://www.eclipse.org/emf/2003/XMLType#nonNegativeInteger Length_._member_._1'"
+	 * @model instanceClass="java.lang.Object" extendedMetaData=
+	 *        "name='Length' memberTypes='http://www.eclipse.org/emf/2003/XMLType#nonNegativeInteger Length_._member_._1'"
 	 * @generated
 	 */
 	EDataType getLength();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Length Member1</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Length Member1</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Length Member1</em>'.
 	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Length_._member_._1' baseType='http://www.eclipse.org/emf/2003/XMLType#token' pattern='\\d+[%25]|\\d*\\.\\d+[%25]'"
+	 * @model instanceClass="java.lang.String" extendedMetaData=
+	 *        "name='Length_._member_._1' baseType='http://www.eclipse.org/emf/2003/XMLType#token' pattern='\\d+[%25]|\\d*\\.\\d+[%25]'"
 	 * @generated
 	 */
 	EDataType getLengthMember1();
 
 	/**
-	 * Returns the meta object for data type '{@link java.util.List <em>Link Types</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.util.List <em>Link Types</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Link Types</em>'.
 	 * @see java.util.List
 	 * @model instanceClass="java.util.List"
@@ -688,9 +638,9 @@
 	EDataType getLinkTypes();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Media Desc</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Media Desc</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Media Desc</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -700,9 +650,9 @@
 	EDataType getMediaDesc();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.Object <em>Multi Length</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.Object <em>Multi Length</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Multi Length</em>'.
 	 * @see java.lang.Object
 	 * @model instanceClass="java.lang.Object"
@@ -712,21 +662,21 @@
 	EDataType getMultiLength();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Multi Length Member1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Multi Length Member1</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Multi Length Member1</em>'.
 	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='MultiLength_._member_._1' baseType='http://www.eclipse.org/emf/2003/XMLType#token' pattern='\\d*\\*'"
+	 * @model instanceClass="java.lang.String" extendedMetaData=
+	 *        "name='MultiLength_._member_._1' baseType='http://www.eclipse.org/emf/2003/XMLType#token' pattern='\\d*\\*'"
 	 * @generated
 	 */
 	EDataType getMultiLengthMember1();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Multi Lengths</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Multi Lengths</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Multi Lengths</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -736,9 +686,9 @@
 	EDataType getMultiLengths();
 
 	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Number</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Number</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Number</em>'.
 	 * @see java.math.BigInteger
 	 * @model instanceClass="java.math.BigInteger"
@@ -748,9 +698,9 @@
 	EDataType getNumber();
 
 	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Pixels</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Pixels</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Pixels</em>'.
 	 * @see java.math.BigInteger
 	 * @model instanceClass="java.math.BigInteger"
@@ -760,33 +710,32 @@
 	EDataType getPixels();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Safe CURIE</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Safe CURIE</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Safe CURIE</em>'.
 	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='SafeCURIE' baseType='http://www.eclipse.org/emf/2003/XMLType#string' minLength='3' pattern='\\[(([\\i-[:]][\\c-[:]]*)?:)?.+\\]'"
+	 * @model instanceClass="java.lang.String" extendedMetaData=
+	 *        "name='SafeCURIE' baseType='http://www.eclipse.org/emf/2003/XMLType#string' minLength='3' pattern='\\[(([\\i-[:]][\\c-[:]]*)?:)?.+\\]'"
 	 * @generated
 	 */
 	EDataType getSafeCURIE();
 
 	/**
-	 * Returns the meta object for data type '{@link java.util.List <em>Safe CURI Es</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for data type '{@link java.util.List <em>Safe CURI Es</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Safe CURI Es</em>'.
 	 * @see java.util.List
-	 * @model instanceClass="java.util.List"
-	 *        extendedMetaData="name='SafeCURIEs' itemType='SafeCURIE'"
+	 * @model instanceClass="java.util.List" extendedMetaData="name='SafeCURIEs' itemType='SafeCURIE'"
 	 * @generated
 	 */
 	EDataType getSafeCURIEs();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Script</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Script</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Script</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -796,9 +745,9 @@
 	EDataType getScript();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Text</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Text</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Text</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -808,9 +757,9 @@
 	EDataType getText();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>URI</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>URI</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>URI</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -820,9 +769,9 @@
 	EDataType getURI();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>UR Ior Safe CURIE</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>UR Ior Safe CURIE</em>}'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>UR Ior Safe CURIE</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -832,33 +781,32 @@
 	EDataType getURIorSafeCURIE();
 
 	/**
-	 * Returns the meta object for data type '{@link java.util.List <em>UR Ior Safe CURI Es</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.util.List <em>UR Ior Safe CURI Es</em>}'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>UR Ior Safe CURI Es</em>'.
 	 * @see java.util.List
-	 * @model instanceClass="java.util.List"
-	 *        extendedMetaData="name='URIorSafeCURIEs' itemType='URIorSafeCURIE'"
+	 * @model instanceClass="java.util.List" extendedMetaData="name='URIorSafeCURIEs' itemType='URIorSafeCURIE'"
 	 * @generated
 	 */
 	EDataType getURIorSafeCURIEs();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>URIREF</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>URIREF</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>URIREF</em>'.
 	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='URIREF' baseType='http://www.eclipse.org/emf/2003/XMLType#string' minLength='1' pattern='#\\c*'"
+	 * @model instanceClass="java.lang.String" extendedMetaData=
+	 *        "name='URIREF' baseType='http://www.eclipse.org/emf/2003/XMLType#string' minLength='1' pattern='#\\c*'"
 	 * @generated
 	 */
 	EDataType getURIREF();
 
 	/**
-	 * Returns the meta object for data type '{@link java.util.List <em>UR Is</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.util.List <em>UR Is</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>UR Is</em>'.
 	 * @see java.util.List
 	 * @model instanceClass="java.util.List"
@@ -868,31 +816,30 @@
 	EDataType getURIs();
 
 	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
 	DatatypesFactory getDatatypesFactory();
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
+	 * <!-- begin-user-doc --> Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0 <em>Frame Target Member0</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0
+		 * <em>Frame Target Member0</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getFrameTargetMember0()
 		 * @generated
@@ -900,9 +847,8 @@
 		EEnum FRAME_TARGET_MEMBER0 = eINSTANCE.getFrameTargetMember0();
 
 		/**
-		 * The meta object literal for the '<em>CDATA</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>CDATA</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getCDATA()
 		 * @generated
@@ -910,9 +856,8 @@
 		EDataType CDATA = eINSTANCE.getCDATA();
 
 		/**
-		 * The meta object literal for the '<em>Character</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Character</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getCharacter()
 		 * @generated
@@ -920,9 +865,8 @@
 		EDataType CHARACTER = eINSTANCE.getCharacter();
 
 		/**
-		 * The meta object literal for the '<em>Charset</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Charset</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getCharset()
 		 * @generated
@@ -930,9 +874,8 @@
 		EDataType CHARSET = eINSTANCE.getCharset();
 
 		/**
-		 * The meta object literal for the '<em>Charsets</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Charsets</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.util.List
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getCharsets()
 		 * @generated
@@ -940,9 +883,8 @@
 		EDataType CHARSETS = eINSTANCE.getCharsets();
 
 		/**
-		 * The meta object literal for the '<em>Color</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Color</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getColor()
 		 * @generated
@@ -950,9 +892,9 @@
 		EDataType COLOR = eINSTANCE.getColor();
 
 		/**
-		 * The meta object literal for the '<em>Color Member1</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Color Member1</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getColorMember1()
 		 * @generated
@@ -960,9 +902,9 @@
 		EDataType COLOR_MEMBER1 = eINSTANCE.getColorMember1();
 
 		/**
-		 * The meta object literal for the '<em>Content Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Content Type</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getContentType()
 		 * @generated
@@ -970,9 +912,9 @@
 		EDataType CONTENT_TYPE = eINSTANCE.getContentType();
 
 		/**
-		 * The meta object literal for the '<em>Content Types</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Content Types</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getContentTypes()
 		 * @generated
@@ -980,9 +922,8 @@
 		EDataType CONTENT_TYPES = eINSTANCE.getContentTypes();
 
 		/**
-		 * The meta object literal for the '<em>CURIE</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>CURIE</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getCURIE()
 		 * @generated
@@ -990,9 +931,8 @@
 		EDataType CURIE = eINSTANCE.getCURIE();
 
 		/**
-		 * The meta object literal for the '<em>CURI Es</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>CURI Es</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.util.List
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getCURIEs()
 		 * @generated
@@ -1000,9 +940,8 @@
 		EDataType CURI_ES = eINSTANCE.getCURIEs();
 
 		/**
-		 * The meta object literal for the '<em>Datetime</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Datetime</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see javax.xml.datatype.XMLGregorianCalendar
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getDatetime()
 		 * @generated
@@ -1010,9 +949,8 @@
 		EDataType DATETIME = eINSTANCE.getDatetime();
 
 		/**
-		 * The meta object literal for the '<em>FPI</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>FPI</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getFPI()
 		 * @generated
@@ -1020,9 +958,9 @@
 		EDataType FPI = eINSTANCE.getFPI();
 
 		/**
-		 * The meta object literal for the '<em>Frame Target</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Frame Target</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see java.lang.Object
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getFrameTarget()
 		 * @generated
@@ -1030,9 +968,9 @@
 		EDataType FRAME_TARGET = eINSTANCE.getFrameTarget();
 
 		/**
-		 * The meta object literal for the '<em>Frame Target Member0 Object</em>' data type.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em>Frame Target Member0 Object</em>' data type. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getFrameTargetMember0Object()
 		 * @generated
@@ -1040,9 +978,9 @@
 		EDataType FRAME_TARGET_MEMBER0_OBJECT = eINSTANCE.getFrameTargetMember0Object();
 
 		/**
-		 * The meta object literal for the '<em>Frame Target Member1</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Frame Target Member1</em>' data type. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getFrameTargetMember1()
 		 * @generated
@@ -1050,9 +988,9 @@
 		EDataType FRAME_TARGET_MEMBER1 = eINSTANCE.getFrameTargetMember1();
 
 		/**
-		 * The meta object literal for the '<em>Language Code</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Language Code</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getLanguageCode()
 		 * @generated
@@ -1060,9 +998,9 @@
 		EDataType LANGUAGE_CODE = eINSTANCE.getLanguageCode();
 
 		/**
-		 * The meta object literal for the '<em>Language Codes</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Language Codes</em>' data type. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getLanguageCodes()
 		 * @generated
@@ -1070,9 +1008,8 @@
 		EDataType LANGUAGE_CODES = eINSTANCE.getLanguageCodes();
 
 		/**
-		 * The meta object literal for the '<em>Length</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Length</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.lang.Object
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getLength()
 		 * @generated
@@ -1080,9 +1017,9 @@
 		EDataType LENGTH = eINSTANCE.getLength();
 
 		/**
-		 * The meta object literal for the '<em>Length Member1</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Length Member1</em>' data type. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getLengthMember1()
 		 * @generated
@@ -1090,9 +1027,9 @@
 		EDataType LENGTH_MEMBER1 = eINSTANCE.getLengthMember1();
 
 		/**
-		 * The meta object literal for the '<em>Link Types</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Link Types</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see java.util.List
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getLinkTypes()
 		 * @generated
@@ -1100,9 +1037,9 @@
 		EDataType LINK_TYPES = eINSTANCE.getLinkTypes();
 
 		/**
-		 * The meta object literal for the '<em>Media Desc</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Media Desc</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getMediaDesc()
 		 * @generated
@@ -1110,9 +1047,9 @@
 		EDataType MEDIA_DESC = eINSTANCE.getMediaDesc();
 
 		/**
-		 * The meta object literal for the '<em>Multi Length</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Multi Length</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see java.lang.Object
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getMultiLength()
 		 * @generated
@@ -1120,9 +1057,9 @@
 		EDataType MULTI_LENGTH = eINSTANCE.getMultiLength();
 
 		/**
-		 * The meta object literal for the '<em>Multi Length Member1</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Multi Length Member1</em>' data type. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getMultiLengthMember1()
 		 * @generated
@@ -1130,9 +1067,9 @@
 		EDataType MULTI_LENGTH_MEMBER1 = eINSTANCE.getMultiLengthMember1();
 
 		/**
-		 * The meta object literal for the '<em>Multi Lengths</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Multi Lengths</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getMultiLengths()
 		 * @generated
@@ -1140,9 +1077,8 @@
 		EDataType MULTI_LENGTHS = eINSTANCE.getMultiLengths();
 
 		/**
-		 * The meta object literal for the '<em>Number</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Number</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.math.BigInteger
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getNumber()
 		 * @generated
@@ -1150,9 +1086,8 @@
 		EDataType NUMBER = eINSTANCE.getNumber();
 
 		/**
-		 * The meta object literal for the '<em>Pixels</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Pixels</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.math.BigInteger
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getPixels()
 		 * @generated
@@ -1160,9 +1095,9 @@
 		EDataType PIXELS = eINSTANCE.getPixels();
 
 		/**
-		 * The meta object literal for the '<em>Safe CURIE</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Safe CURIE</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getSafeCURIE()
 		 * @generated
@@ -1170,9 +1105,9 @@
 		EDataType SAFE_CURIE = eINSTANCE.getSafeCURIE();
 
 		/**
-		 * The meta object literal for the '<em>Safe CURI Es</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Safe CURI Es</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see java.util.List
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getSafeCURIEs()
 		 * @generated
@@ -1180,9 +1115,8 @@
 		EDataType SAFE_CURI_ES = eINSTANCE.getSafeCURIEs();
 
 		/**
-		 * The meta object literal for the '<em>Script</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Script</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getScript()
 		 * @generated
@@ -1190,9 +1124,8 @@
 		EDataType SCRIPT = eINSTANCE.getScript();
 
 		/**
-		 * The meta object literal for the '<em>Text</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Text</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getText()
 		 * @generated
@@ -1200,9 +1133,8 @@
 		EDataType TEXT = eINSTANCE.getText();
 
 		/**
-		 * The meta object literal for the '<em>URI</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>URI</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getURI()
 		 * @generated
@@ -1210,9 +1142,9 @@
 		EDataType URI = eINSTANCE.getURI();
 
 		/**
-		 * The meta object literal for the '<em>UR Ior Safe CURIE</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>UR Ior Safe CURIE</em>' data type. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getURIorSafeCURIE()
 		 * @generated
@@ -1220,9 +1152,9 @@
 		EDataType UR_IOR_SAFE_CURIE = eINSTANCE.getURIorSafeCURIE();
 
 		/**
-		 * The meta object literal for the '<em>UR Ior Safe CURI Es</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>UR Ior Safe CURI Es</em>' data type. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see java.util.List
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getURIorSafeCURIEs()
 		 * @generated
@@ -1230,9 +1162,8 @@
 		EDataType UR_IOR_SAFE_CURI_ES = eINSTANCE.getURIorSafeCURIEs();
 
 		/**
-		 * The meta object literal for the '<em>URIREF</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>URIREF</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getURIREF()
 		 * @generated
@@ -1240,9 +1171,8 @@
 		EDataType URIREF = eINSTANCE.getURIREF();
 
 		/**
-		 * The meta object literal for the '<em>UR Is</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>UR Is</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.util.List
 		 * @see org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl#getURIs()
 		 * @generated
@@ -1251,4 +1181,4 @@
 
 	}
 
-} //DatatypesPackage
+} // DatatypesPackage
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/FrameTargetMember0.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/FrameTargetMember0.java
index e5b1bf6..3f5fbda 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/FrameTargetMember0.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/FrameTargetMember0.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,63 +18,58 @@
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Frame Target Member0</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Frame Target Member0</b></em>',
+ * and utility methods for working with them. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.datatypes.DatatypesPackage#getFrameTargetMember0()
  * @model extendedMetaData="name='FrameTarget_._member_._0'"
  * @generated
  */
 public enum FrameTargetMember0 implements Enumerator {
 	/**
-	 * The '<em><b>Blank</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Blank</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #BLANK_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	BLANK(0, "blank", "_blank"),
+	BLANK(0, "blank", "_blank"), //$NON-NLS-1$//$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Self</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Self</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #SELF_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	SELF(1, "self", "_self"),
+	SELF(1, "self", "_self"), //$NON-NLS-1$//$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Parent</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Parent</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #PARENT_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	PARENT(2, "parent", "_parent"),
+	PARENT(2, "parent", "_parent"), //$NON-NLS-1$//$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Top</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Top</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #TOP_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	TOP(3, "top", "_top");
+	TOP(3, "top", "_top"); //$NON-NLS-1$//$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Blank</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Blank</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Blank</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Blank</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #BLANK
 	 * @model name="blank" literal="_blank"
 	 * @generated
@@ -83,13 +78,13 @@
 	public static final int BLANK_VALUE = 0;
 
 	/**
-	 * The '<em><b>Self</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Self</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Self</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Self</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SELF
 	 * @model name="self" literal="_self"
 	 * @generated
@@ -98,13 +93,13 @@
 	public static final int SELF_VALUE = 1;
 
 	/**
-	 * The '<em><b>Parent</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Parent</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Parent</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Parent</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #PARENT
 	 * @model name="parent" literal="_parent"
 	 * @generated
@@ -113,13 +108,13 @@
 	public static final int PARENT_VALUE = 2;
 
 	/**
-	 * The '<em><b>Top</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Top</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Top</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Top</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #TOP
 	 * @model name="top" literal="_top"
 	 * @generated
@@ -128,36 +123,29 @@
 	public static final int TOP_VALUE = 3;
 
 	/**
-	 * An array of all the '<em><b>Frame Target Member0</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * An array of all the '<em><b>Frame Target Member0</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
-	private static final FrameTargetMember0[] VALUES_ARRAY =
-		new FrameTargetMember0[] {
-			BLANK,
-			SELF,
-			PARENT,
-			TOP,
-		};
+	private static final FrameTargetMember0[] VALUES_ARRAY = new FrameTargetMember0[] { BLANK, SELF, PARENT, TOP, };
 
 	/**
-	 * A public read-only list of all the '<em><b>Frame Target Member0</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
+	 * A public read-only list of all the '<em><b>Frame Target Member0</b></em>' enumerators. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<FrameTargetMember0> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Frame Target Member0</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Frame Target Member0</b></em>' literal with the specified literal value. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static FrameTargetMember0 get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			FrameTargetMember0 result = VALUES_ARRAY[i];
+		for (FrameTargetMember0 result : VALUES_ARRAY) {
 			if (result.toString().equals(literal)) {
 				return result;
 			}
@@ -166,14 +154,13 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Frame Target Member0</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Frame Target Member0</b></em>' literal with the specified name. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static FrameTargetMember0 getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			FrameTargetMember0 result = VALUES_ARRAY[i];
+		for (FrameTargetMember0 result : VALUES_ARRAY) {
 			if (result.getName().equals(name)) {
 				return result;
 			}
@@ -182,46 +169,49 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Frame Target Member0</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Frame Target Member0</b></em>' literal with the specified integer value. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static FrameTargetMember0 get(int value) {
 		switch (value) {
-			case BLANK_VALUE: return BLANK;
-			case SELF_VALUE: return SELF;
-			case PARENT_VALUE: return PARENT;
-			case TOP_VALUE: return TOP;
+		case BLANK_VALUE:
+			return BLANK;
+		case SELF_VALUE:
+			return SELF;
+		case PARENT_VALUE:
+			return PARENT;
+		case TOP_VALUE:
+			return TOP;
 		}
 		return null;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private FrameTargetMember0(int value, String name, String literal) {
@@ -231,41 +221,41 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
-} //FrameTargetMember0
+
+} // FrameTargetMember0
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/impl/DatatypesFactoryImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/impl/DatatypesFactoryImpl.java
index 820fa5b..01a15fe 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/impl/DatatypesFactoryImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/impl/DatatypesFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,7 +12,6 @@
 package org.eclipse.rmf.reqif10.datatypes.impl;
 
 import java.math.BigInteger;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,48 +21,41 @@
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
 import org.eclipse.emf.ecore.util.Diagnostician;
-
 import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-import org.eclipse.rmf.reqif10.datatypes.*;
+import org.eclipse.rmf.reqif10.datatypes.DatatypesFactory;
+import org.eclipse.rmf.reqif10.datatypes.DatatypesPackage;
+import org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFactory {
 	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static DatatypesFactory init() {
 		try {
-			DatatypesFactory theDatatypesFactory = (DatatypesFactory)EPackage.Registry.INSTANCE.getEFactory(DatatypesPackage.eNS_URI);
+			DatatypesFactory theDatatypesFactory = (DatatypesFactory) EPackage.Registry.INSTANCE.getEFactory(DatatypesPackage.eNS_URI);
 			if (theDatatypesFactory != null) {
 				return theDatatypesFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new DatatypesFactoryImpl();
 	}
 
 	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypesFactoryImpl() {
@@ -71,202 +63,204 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
 		switch (eDataType.getClassifierID()) {
-			case DatatypesPackage.FRAME_TARGET_MEMBER0:
-				return createFrameTargetMember0FromString(eDataType, initialValue);
-			case DatatypesPackage.CDATA:
-				return createCDATAFromString(eDataType, initialValue);
-			case DatatypesPackage.CHARACTER:
-				return createCharacterFromString(eDataType, initialValue);
-			case DatatypesPackage.CHARSET:
-				return createCharsetFromString(eDataType, initialValue);
-			case DatatypesPackage.CHARSETS:
-				return createCharsetsFromString(eDataType, initialValue);
-			case DatatypesPackage.COLOR:
-				return createColorFromString(eDataType, initialValue);
-			case DatatypesPackage.COLOR_MEMBER1:
-				return createColorMember1FromString(eDataType, initialValue);
-			case DatatypesPackage.CONTENT_TYPE:
-				return createContentTypeFromString(eDataType, initialValue);
-			case DatatypesPackage.CONTENT_TYPES:
-				return createContentTypesFromString(eDataType, initialValue);
-			case DatatypesPackage.CURIE:
-				return createCURIEFromString(eDataType, initialValue);
-			case DatatypesPackage.CURI_ES:
-				return createCURIEsFromString(eDataType, initialValue);
-			case DatatypesPackage.DATETIME:
-				return createDatetimeFromString(eDataType, initialValue);
-			case DatatypesPackage.FPI:
-				return createFPIFromString(eDataType, initialValue);
-			case DatatypesPackage.FRAME_TARGET:
-				return createFrameTargetFromString(eDataType, initialValue);
-			case DatatypesPackage.FRAME_TARGET_MEMBER0_OBJECT:
-				return createFrameTargetMember0ObjectFromString(eDataType, initialValue);
-			case DatatypesPackage.FRAME_TARGET_MEMBER1:
-				return createFrameTargetMember1FromString(eDataType, initialValue);
-			case DatatypesPackage.LANGUAGE_CODE:
-				return createLanguageCodeFromString(eDataType, initialValue);
-			case DatatypesPackage.LANGUAGE_CODES:
-				return createLanguageCodesFromString(eDataType, initialValue);
-			case DatatypesPackage.LENGTH:
-				return createLengthFromString(eDataType, initialValue);
-			case DatatypesPackage.LENGTH_MEMBER1:
-				return createLengthMember1FromString(eDataType, initialValue);
-			case DatatypesPackage.LINK_TYPES:
-				return createLinkTypesFromString(eDataType, initialValue);
-			case DatatypesPackage.MEDIA_DESC:
-				return createMediaDescFromString(eDataType, initialValue);
-			case DatatypesPackage.MULTI_LENGTH:
-				return createMultiLengthFromString(eDataType, initialValue);
-			case DatatypesPackage.MULTI_LENGTH_MEMBER1:
-				return createMultiLengthMember1FromString(eDataType, initialValue);
-			case DatatypesPackage.MULTI_LENGTHS:
-				return createMultiLengthsFromString(eDataType, initialValue);
-			case DatatypesPackage.NUMBER:
-				return createNumberFromString(eDataType, initialValue);
-			case DatatypesPackage.PIXELS:
-				return createPixelsFromString(eDataType, initialValue);
-			case DatatypesPackage.SAFE_CURIE:
-				return createSafeCURIEFromString(eDataType, initialValue);
-			case DatatypesPackage.SAFE_CURI_ES:
-				return createSafeCURIEsFromString(eDataType, initialValue);
-			case DatatypesPackage.SCRIPT:
-				return createScriptFromString(eDataType, initialValue);
-			case DatatypesPackage.TEXT:
-				return createTextFromString(eDataType, initialValue);
-			case DatatypesPackage.URI:
-				return createURIFromString(eDataType, initialValue);
-			case DatatypesPackage.UR_IOR_SAFE_CURIE:
-				return createURIorSafeCURIEFromString(eDataType, initialValue);
-			case DatatypesPackage.UR_IOR_SAFE_CURI_ES:
-				return createURIorSafeCURIEsFromString(eDataType, initialValue);
-			case DatatypesPackage.URIREF:
-				return createURIREFFromString(eDataType, initialValue);
-			case DatatypesPackage.UR_IS:
-				return createURIsFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		case DatatypesPackage.FRAME_TARGET_MEMBER0:
+			return createFrameTargetMember0FromString(eDataType, initialValue);
+		case DatatypesPackage.CDATA:
+			return createCDATAFromString(eDataType, initialValue);
+		case DatatypesPackage.CHARACTER:
+			return createCharacterFromString(eDataType, initialValue);
+		case DatatypesPackage.CHARSET:
+			return createCharsetFromString(eDataType, initialValue);
+		case DatatypesPackage.CHARSETS:
+			return createCharsetsFromString(eDataType, initialValue);
+		case DatatypesPackage.COLOR:
+			return createColorFromString(eDataType, initialValue);
+		case DatatypesPackage.COLOR_MEMBER1:
+			return createColorMember1FromString(eDataType, initialValue);
+		case DatatypesPackage.CONTENT_TYPE:
+			return createContentTypeFromString(eDataType, initialValue);
+		case DatatypesPackage.CONTENT_TYPES:
+			return createContentTypesFromString(eDataType, initialValue);
+		case DatatypesPackage.CURIE:
+			return createCURIEFromString(eDataType, initialValue);
+		case DatatypesPackage.CURI_ES:
+			return createCURIEsFromString(eDataType, initialValue);
+		case DatatypesPackage.DATETIME:
+			return createDatetimeFromString(eDataType, initialValue);
+		case DatatypesPackage.FPI:
+			return createFPIFromString(eDataType, initialValue);
+		case DatatypesPackage.FRAME_TARGET:
+			return createFrameTargetFromString(eDataType, initialValue);
+		case DatatypesPackage.FRAME_TARGET_MEMBER0_OBJECT:
+			return createFrameTargetMember0ObjectFromString(eDataType, initialValue);
+		case DatatypesPackage.FRAME_TARGET_MEMBER1:
+			return createFrameTargetMember1FromString(eDataType, initialValue);
+		case DatatypesPackage.LANGUAGE_CODE:
+			return createLanguageCodeFromString(eDataType, initialValue);
+		case DatatypesPackage.LANGUAGE_CODES:
+			return createLanguageCodesFromString(eDataType, initialValue);
+		case DatatypesPackage.LENGTH:
+			return createLengthFromString(eDataType, initialValue);
+		case DatatypesPackage.LENGTH_MEMBER1:
+			return createLengthMember1FromString(eDataType, initialValue);
+		case DatatypesPackage.LINK_TYPES:
+			return createLinkTypesFromString(eDataType, initialValue);
+		case DatatypesPackage.MEDIA_DESC:
+			return createMediaDescFromString(eDataType, initialValue);
+		case DatatypesPackage.MULTI_LENGTH:
+			return createMultiLengthFromString(eDataType, initialValue);
+		case DatatypesPackage.MULTI_LENGTH_MEMBER1:
+			return createMultiLengthMember1FromString(eDataType, initialValue);
+		case DatatypesPackage.MULTI_LENGTHS:
+			return createMultiLengthsFromString(eDataType, initialValue);
+		case DatatypesPackage.NUMBER:
+			return createNumberFromString(eDataType, initialValue);
+		case DatatypesPackage.PIXELS:
+			return createPixelsFromString(eDataType, initialValue);
+		case DatatypesPackage.SAFE_CURIE:
+			return createSafeCURIEFromString(eDataType, initialValue);
+		case DatatypesPackage.SAFE_CURI_ES:
+			return createSafeCURIEsFromString(eDataType, initialValue);
+		case DatatypesPackage.SCRIPT:
+			return createScriptFromString(eDataType, initialValue);
+		case DatatypesPackage.TEXT:
+			return createTextFromString(eDataType, initialValue);
+		case DatatypesPackage.URI:
+			return createURIFromString(eDataType, initialValue);
+		case DatatypesPackage.UR_IOR_SAFE_CURIE:
+			return createURIorSafeCURIEFromString(eDataType, initialValue);
+		case DatatypesPackage.UR_IOR_SAFE_CURI_ES:
+			return createURIorSafeCURIEsFromString(eDataType, initialValue);
+		case DatatypesPackage.URIREF:
+			return createURIREFFromString(eDataType, initialValue);
+		case DatatypesPackage.UR_IS:
+			return createURIsFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
 		switch (eDataType.getClassifierID()) {
-			case DatatypesPackage.FRAME_TARGET_MEMBER0:
-				return convertFrameTargetMember0ToString(eDataType, instanceValue);
-			case DatatypesPackage.CDATA:
-				return convertCDATAToString(eDataType, instanceValue);
-			case DatatypesPackage.CHARACTER:
-				return convertCharacterToString(eDataType, instanceValue);
-			case DatatypesPackage.CHARSET:
-				return convertCharsetToString(eDataType, instanceValue);
-			case DatatypesPackage.CHARSETS:
-				return convertCharsetsToString(eDataType, instanceValue);
-			case DatatypesPackage.COLOR:
-				return convertColorToString(eDataType, instanceValue);
-			case DatatypesPackage.COLOR_MEMBER1:
-				return convertColorMember1ToString(eDataType, instanceValue);
-			case DatatypesPackage.CONTENT_TYPE:
-				return convertContentTypeToString(eDataType, instanceValue);
-			case DatatypesPackage.CONTENT_TYPES:
-				return convertContentTypesToString(eDataType, instanceValue);
-			case DatatypesPackage.CURIE:
-				return convertCURIEToString(eDataType, instanceValue);
-			case DatatypesPackage.CURI_ES:
-				return convertCURIEsToString(eDataType, instanceValue);
-			case DatatypesPackage.DATETIME:
-				return convertDatetimeToString(eDataType, instanceValue);
-			case DatatypesPackage.FPI:
-				return convertFPIToString(eDataType, instanceValue);
-			case DatatypesPackage.FRAME_TARGET:
-				return convertFrameTargetToString(eDataType, instanceValue);
-			case DatatypesPackage.FRAME_TARGET_MEMBER0_OBJECT:
-				return convertFrameTargetMember0ObjectToString(eDataType, instanceValue);
-			case DatatypesPackage.FRAME_TARGET_MEMBER1:
-				return convertFrameTargetMember1ToString(eDataType, instanceValue);
-			case DatatypesPackage.LANGUAGE_CODE:
-				return convertLanguageCodeToString(eDataType, instanceValue);
-			case DatatypesPackage.LANGUAGE_CODES:
-				return convertLanguageCodesToString(eDataType, instanceValue);
-			case DatatypesPackage.LENGTH:
-				return convertLengthToString(eDataType, instanceValue);
-			case DatatypesPackage.LENGTH_MEMBER1:
-				return convertLengthMember1ToString(eDataType, instanceValue);
-			case DatatypesPackage.LINK_TYPES:
-				return convertLinkTypesToString(eDataType, instanceValue);
-			case DatatypesPackage.MEDIA_DESC:
-				return convertMediaDescToString(eDataType, instanceValue);
-			case DatatypesPackage.MULTI_LENGTH:
-				return convertMultiLengthToString(eDataType, instanceValue);
-			case DatatypesPackage.MULTI_LENGTH_MEMBER1:
-				return convertMultiLengthMember1ToString(eDataType, instanceValue);
-			case DatatypesPackage.MULTI_LENGTHS:
-				return convertMultiLengthsToString(eDataType, instanceValue);
-			case DatatypesPackage.NUMBER:
-				return convertNumberToString(eDataType, instanceValue);
-			case DatatypesPackage.PIXELS:
-				return convertPixelsToString(eDataType, instanceValue);
-			case DatatypesPackage.SAFE_CURIE:
-				return convertSafeCURIEToString(eDataType, instanceValue);
-			case DatatypesPackage.SAFE_CURI_ES:
-				return convertSafeCURIEsToString(eDataType, instanceValue);
-			case DatatypesPackage.SCRIPT:
-				return convertScriptToString(eDataType, instanceValue);
-			case DatatypesPackage.TEXT:
-				return convertTextToString(eDataType, instanceValue);
-			case DatatypesPackage.URI:
-				return convertURIToString(eDataType, instanceValue);
-			case DatatypesPackage.UR_IOR_SAFE_CURIE:
-				return convertURIorSafeCURIEToString(eDataType, instanceValue);
-			case DatatypesPackage.UR_IOR_SAFE_CURI_ES:
-				return convertURIorSafeCURIEsToString(eDataType, instanceValue);
-			case DatatypesPackage.URIREF:
-				return convertURIREFToString(eDataType, instanceValue);
-			case DatatypesPackage.UR_IS:
-				return convertURIsToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		case DatatypesPackage.FRAME_TARGET_MEMBER0:
+			return convertFrameTargetMember0ToString(eDataType, instanceValue);
+		case DatatypesPackage.CDATA:
+			return convertCDATAToString(eDataType, instanceValue);
+		case DatatypesPackage.CHARACTER:
+			return convertCharacterToString(eDataType, instanceValue);
+		case DatatypesPackage.CHARSET:
+			return convertCharsetToString(eDataType, instanceValue);
+		case DatatypesPackage.CHARSETS:
+			return convertCharsetsToString(eDataType, instanceValue);
+		case DatatypesPackage.COLOR:
+			return convertColorToString(eDataType, instanceValue);
+		case DatatypesPackage.COLOR_MEMBER1:
+			return convertColorMember1ToString(eDataType, instanceValue);
+		case DatatypesPackage.CONTENT_TYPE:
+			return convertContentTypeToString(eDataType, instanceValue);
+		case DatatypesPackage.CONTENT_TYPES:
+			return convertContentTypesToString(eDataType, instanceValue);
+		case DatatypesPackage.CURIE:
+			return convertCURIEToString(eDataType, instanceValue);
+		case DatatypesPackage.CURI_ES:
+			return convertCURIEsToString(eDataType, instanceValue);
+		case DatatypesPackage.DATETIME:
+			return convertDatetimeToString(eDataType, instanceValue);
+		case DatatypesPackage.FPI:
+			return convertFPIToString(eDataType, instanceValue);
+		case DatatypesPackage.FRAME_TARGET:
+			return convertFrameTargetToString(eDataType, instanceValue);
+		case DatatypesPackage.FRAME_TARGET_MEMBER0_OBJECT:
+			return convertFrameTargetMember0ObjectToString(eDataType, instanceValue);
+		case DatatypesPackage.FRAME_TARGET_MEMBER1:
+			return convertFrameTargetMember1ToString(eDataType, instanceValue);
+		case DatatypesPackage.LANGUAGE_CODE:
+			return convertLanguageCodeToString(eDataType, instanceValue);
+		case DatatypesPackage.LANGUAGE_CODES:
+			return convertLanguageCodesToString(eDataType, instanceValue);
+		case DatatypesPackage.LENGTH:
+			return convertLengthToString(eDataType, instanceValue);
+		case DatatypesPackage.LENGTH_MEMBER1:
+			return convertLengthMember1ToString(eDataType, instanceValue);
+		case DatatypesPackage.LINK_TYPES:
+			return convertLinkTypesToString(eDataType, instanceValue);
+		case DatatypesPackage.MEDIA_DESC:
+			return convertMediaDescToString(eDataType, instanceValue);
+		case DatatypesPackage.MULTI_LENGTH:
+			return convertMultiLengthToString(eDataType, instanceValue);
+		case DatatypesPackage.MULTI_LENGTH_MEMBER1:
+			return convertMultiLengthMember1ToString(eDataType, instanceValue);
+		case DatatypesPackage.MULTI_LENGTHS:
+			return convertMultiLengthsToString(eDataType, instanceValue);
+		case DatatypesPackage.NUMBER:
+			return convertNumberToString(eDataType, instanceValue);
+		case DatatypesPackage.PIXELS:
+			return convertPixelsToString(eDataType, instanceValue);
+		case DatatypesPackage.SAFE_CURIE:
+			return convertSafeCURIEToString(eDataType, instanceValue);
+		case DatatypesPackage.SAFE_CURI_ES:
+			return convertSafeCURIEsToString(eDataType, instanceValue);
+		case DatatypesPackage.SCRIPT:
+			return convertScriptToString(eDataType, instanceValue);
+		case DatatypesPackage.TEXT:
+			return convertTextToString(eDataType, instanceValue);
+		case DatatypesPackage.URI:
+			return convertURIToString(eDataType, instanceValue);
+		case DatatypesPackage.UR_IOR_SAFE_CURIE:
+			return convertURIorSafeCURIEToString(eDataType, instanceValue);
+		case DatatypesPackage.UR_IOR_SAFE_CURI_ES:
+			return convertURIorSafeCURIEsToString(eDataType, instanceValue);
+		case DatatypesPackage.URIREF:
+			return convertURIREFToString(eDataType, instanceValue);
+		case DatatypesPackage.UR_IS:
+			return convertURIsToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FrameTargetMember0 createFrameTargetMember0FromString(EDataType eDataType, String initialValue) {
 		FrameTargetMember0 result = FrameTargetMember0.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null) {
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		}
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertFrameTargetMember0ToString(EDataType eDataType, Object instanceValue) {
@@ -274,17 +268,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createCDATAFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertCDATAToString(EDataType eDataType, Object instanceValue) {
@@ -292,17 +286,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createCharacterFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertCharacterToString(EDataType eDataType, Object instanceValue) {
@@ -310,17 +304,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createCharsetFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertCharsetToString(EDataType eDataType, Object instanceValue) {
@@ -328,12 +322,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public List<String> createCharsetsFromString(EDataType eDataType, String initialValue) {
-		if (initialValue == null) return null;
+		if (initialValue == null) {
+			return null;
+		}
 		List<String> result = new ArrayList<String>();
 		for (String item : split(initialValue)) {
 			result.add(createCharsetFromString(DatatypesPackage.Literals.CHARSET, item));
@@ -342,14 +338,18 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertCharsetsToString(EDataType eDataType, Object instanceValue) {
-		if (instanceValue == null) return null;
-		List<?> list = (List<?>)instanceValue;
-		if (list.isEmpty()) return "";
+		if (instanceValue == null) {
+			return null;
+		}
+		List<?> list = (List<?>) instanceValue;
+		if (list.isEmpty()) {
+			return ""; //$NON-NLS-1$
+		}
 		StringBuffer result = new StringBuffer();
 		for (Object item : list) {
 			result.append(convertCharsetToString(DatatypesPackage.Literals.CHARSET, item));
@@ -359,21 +359,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createColorFromString(EDataType eDataType, String initialValue) {
-		if (initialValue == null) return null;
+		if (initialValue == null) {
+			return null;
+		}
 		String result = null;
 		RuntimeException exception = null;
 		try {
-			result = (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.NMTOKEN, initialValue);
+			result = (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.NMTOKEN, initialValue);
 			if (result != null && Diagnostician.INSTANCE.validate(eDataType, result, null, null)) {
 				return result;
 			}
-		}
-		catch (RuntimeException e) {
+		} catch (RuntimeException e) {
 			exception = e;
 		}
 		try {
@@ -381,55 +382,60 @@
 			if (result != null && Diagnostician.INSTANCE.validate(eDataType, result, null, null)) {
 				return result;
 			}
-		}
-		catch (RuntimeException e) {
+		} catch (RuntimeException e) {
 			exception = e;
 		}
-		if (result != null || exception == null) return result;
-    
+		if (result != null || exception == null) {
+			return result;
+		}
+
 		throw exception;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertColorToString(EDataType eDataType, Object instanceValue) {
-		if (instanceValue == null) return null;
+		if (instanceValue == null) {
+			return null;
+		}
 		if (XMLTypePackage.Literals.NMTOKEN.isInstance(instanceValue)) {
 			try {
 				String value = XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.NMTOKEN, instanceValue);
-				if (value != null) return value;
-			}
-			catch (Exception e) {
+				if (value != null) {
+					return value;
+				}
+			} catch (Exception e) {
 				// Keep trying other member types until all have failed.
 			}
 		}
 		if (DatatypesPackage.Literals.COLOR_MEMBER1.isInstance(instanceValue)) {
 			try {
 				String value = convertColorMember1ToString(DatatypesPackage.Literals.COLOR_MEMBER1, instanceValue);
-				if (value != null) return value;
-			}
-			catch (Exception e) {
+				if (value != null) {
+					return value;
+				}
+			} catch (Exception e) {
 				// Keep trying other member types until all have failed.
 			}
 		}
-		throw new IllegalArgumentException("Invalid value: '"+instanceValue+"' for datatype :"+eDataType.getName());
+		throw new IllegalArgumentException("Invalid value: '" + instanceValue + "' for datatype :" + eDataType.getName()); //$NON-NLS-1$//$NON-NLS-2$
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createColorMember1FromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertColorMember1ToString(EDataType eDataType, Object instanceValue) {
@@ -437,17 +443,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createContentTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertContentTypeToString(EDataType eDataType, Object instanceValue) {
@@ -455,17 +461,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createContentTypesFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertContentTypesToString(EDataType eDataType, Object instanceValue) {
@@ -473,17 +479,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createCURIEFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertCURIEToString(EDataType eDataType, Object instanceValue) {
@@ -491,12 +497,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public List<String> createCURIEsFromString(EDataType eDataType, String initialValue) {
-		if (initialValue == null) return null;
+		if (initialValue == null) {
+			return null;
+		}
 		List<String> result = new ArrayList<String>();
 		for (String item : split(initialValue)) {
 			result.add(createCURIEFromString(DatatypesPackage.Literals.CURIE, item));
@@ -505,14 +513,18 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertCURIEsToString(EDataType eDataType, Object instanceValue) {
-		if (instanceValue == null) return null;
-		List<?> list = (List<?>)instanceValue;
-		if (list.isEmpty()) return "";
+		if (instanceValue == null) {
+			return null;
+		}
+		List<?> list = (List<?>) instanceValue;
+		if (list.isEmpty()) {
+			return ""; //$NON-NLS-1$
+		}
 		StringBuffer result = new StringBuffer();
 		for (Object item : list) {
 			result.append(convertCURIEToString(DatatypesPackage.Literals.CURIE, item));
@@ -522,17 +534,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XMLGregorianCalendar createDatetimeFromString(EDataType eDataType, String initialValue) {
-		return (XMLGregorianCalendar)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.DATE_TIME, initialValue);
+		return (XMLGregorianCalendar) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.DATE_TIME, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertDatetimeToString(EDataType eDataType, Object instanceValue) {
@@ -540,17 +552,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createFPIFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.NORMALIZED_STRING, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.NORMALIZED_STRING, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertFPIToString(EDataType eDataType, Object instanceValue) {
@@ -558,12 +570,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object createFrameTargetFromString(EDataType eDataType, String initialValue) {
-		if (initialValue == null) return null;
+		if (initialValue == null) {
+			return null;
+		}
 		Object result = null;
 		RuntimeException exception = null;
 		try {
@@ -571,8 +585,7 @@
 			if (result != null && Diagnostician.INSTANCE.validate(eDataType, result, null, null)) {
 				return result;
 			}
-		}
-		catch (RuntimeException e) {
+		} catch (RuntimeException e) {
 			exception = e;
 		}
 		try {
@@ -580,46 +593,51 @@
 			if (result != null && Diagnostician.INSTANCE.validate(eDataType, result, null, null)) {
 				return result;
 			}
-		}
-		catch (RuntimeException e) {
+		} catch (RuntimeException e) {
 			exception = e;
 		}
-		if (result != null || exception == null) return result;
-    
+		if (result != null || exception == null) {
+			return result;
+		}
+
 		throw exception;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertFrameTargetToString(EDataType eDataType, Object instanceValue) {
-		if (instanceValue == null) return null;
+		if (instanceValue == null) {
+			return null;
+		}
 		if (DatatypesPackage.Literals.FRAME_TARGET_MEMBER0.isInstance(instanceValue)) {
 			try {
 				String value = convertFrameTargetMember0ToString(DatatypesPackage.Literals.FRAME_TARGET_MEMBER0, instanceValue);
-				if (value != null) return value;
-			}
-			catch (Exception e) {
+				if (value != null) {
+					return value;
+				}
+			} catch (Exception e) {
 				// Keep trying other member types until all have failed.
 			}
 		}
 		if (DatatypesPackage.Literals.FRAME_TARGET_MEMBER1.isInstance(instanceValue)) {
 			try {
 				String value = convertFrameTargetMember1ToString(DatatypesPackage.Literals.FRAME_TARGET_MEMBER1, instanceValue);
-				if (value != null) return value;
-			}
-			catch (Exception e) {
+				if (value != null) {
+					return value;
+				}
+			} catch (Exception e) {
 				// Keep trying other member types until all have failed.
 			}
 		}
-		throw new IllegalArgumentException("Invalid value: '"+instanceValue+"' for datatype :"+eDataType.getName());
+		throw new IllegalArgumentException("Invalid value: '" + instanceValue + "' for datatype :" + eDataType.getName()); //$NON-NLS-1$//$NON-NLS-2$
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FrameTargetMember0 createFrameTargetMember0ObjectFromString(EDataType eDataType, String initialValue) {
@@ -627,8 +645,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertFrameTargetMember0ObjectToString(EDataType eDataType, Object instanceValue) {
@@ -636,17 +654,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createFrameTargetMember1FromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertFrameTargetMember1ToString(EDataType eDataType, Object instanceValue) {
@@ -654,17 +672,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createLanguageCodeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.LANGUAGE, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.LANGUAGE, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertLanguageCodeToString(EDataType eDataType, Object instanceValue) {
@@ -672,17 +690,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createLanguageCodesFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertLanguageCodesToString(EDataType eDataType, Object instanceValue) {
@@ -690,12 +708,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object createLengthFromString(EDataType eDataType, String initialValue) {
-		if (initialValue == null) return null;
+		if (initialValue == null) {
+			return null;
+		}
 		Object result = null;
 		RuntimeException exception = null;
 		try {
@@ -703,8 +723,7 @@
 			if (result != null && Diagnostician.INSTANCE.validate(eDataType, result, null, null)) {
 				return result;
 			}
-		}
-		catch (RuntimeException e) {
+		} catch (RuntimeException e) {
 			exception = e;
 		}
 		try {
@@ -712,55 +731,60 @@
 			if (result != null && Diagnostician.INSTANCE.validate(eDataType, result, null, null)) {
 				return result;
 			}
-		}
-		catch (RuntimeException e) {
+		} catch (RuntimeException e) {
 			exception = e;
 		}
-		if (result != null || exception == null) return result;
-    
+		if (result != null || exception == null) {
+			return result;
+		}
+
 		throw exception;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertLengthToString(EDataType eDataType, Object instanceValue) {
-		if (instanceValue == null) return null;
+		if (instanceValue == null) {
+			return null;
+		}
 		if (XMLTypePackage.Literals.NON_NEGATIVE_INTEGER.isInstance(instanceValue)) {
 			try {
 				String value = XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.NON_NEGATIVE_INTEGER, instanceValue);
-				if (value != null) return value;
-			}
-			catch (Exception e) {
+				if (value != null) {
+					return value;
+				}
+			} catch (Exception e) {
 				// Keep trying other member types until all have failed.
 			}
 		}
 		if (DatatypesPackage.Literals.LENGTH_MEMBER1.isInstance(instanceValue)) {
 			try {
 				String value = convertLengthMember1ToString(DatatypesPackage.Literals.LENGTH_MEMBER1, instanceValue);
-				if (value != null) return value;
-			}
-			catch (Exception e) {
+				if (value != null) {
+					return value;
+				}
+			} catch (Exception e) {
 				// Keep trying other member types until all have failed.
 			}
 		}
-		throw new IllegalArgumentException("Invalid value: '"+instanceValue+"' for datatype :"+eDataType.getName());
+		throw new IllegalArgumentException("Invalid value: '" + instanceValue + "' for datatype :" + eDataType.getName()); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createLengthMember1FromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertLengthMember1ToString(EDataType eDataType, Object instanceValue) {
@@ -768,28 +792,34 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public List<String> createLinkTypesFromString(EDataType eDataType, String initialValue) {
-		if (initialValue == null) return null;
+		if (initialValue == null) {
+			return null;
+		}
 		List<String> result = new ArrayList<String>();
 		for (String item : split(initialValue)) {
-			result.add((String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.NMTOKEN, item));
+			result.add((String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.NMTOKEN, item));
 		}
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertLinkTypesToString(EDataType eDataType, Object instanceValue) {
-		if (instanceValue == null) return null;
-		List<?> list = (List<?>)instanceValue;
-		if (list.isEmpty()) return "";
+		if (instanceValue == null) {
+			return null;
+		}
+		List<?> list = (List<?>) instanceValue;
+		if (list.isEmpty()) {
+			return ""; //$NON-NLS-1$
+		}
 		StringBuffer result = new StringBuffer();
 		for (Object item : list) {
 			result.append(XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.NMTOKEN, item));
@@ -799,17 +829,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createMediaDescFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertMediaDescToString(EDataType eDataType, Object instanceValue) {
@@ -817,12 +847,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object createMultiLengthFromString(EDataType eDataType, String initialValue) {
-		if (initialValue == null) return null;
+		if (initialValue == null) {
+			return null;
+		}
 		Object result = null;
 		RuntimeException exception = null;
 		try {
@@ -830,8 +862,7 @@
 			if (result != null && Diagnostician.INSTANCE.validate(eDataType, result, null, null)) {
 				return result;
 			}
-		}
-		catch (RuntimeException e) {
+		} catch (RuntimeException e) {
 			exception = e;
 		}
 		try {
@@ -839,55 +870,60 @@
 			if (result != null && Diagnostician.INSTANCE.validate(eDataType, result, null, null)) {
 				return result;
 			}
-		}
-		catch (RuntimeException e) {
+		} catch (RuntimeException e) {
 			exception = e;
 		}
-		if (result != null || exception == null) return result;
-    
+		if (result != null || exception == null) {
+			return result;
+		}
+
 		throw exception;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertMultiLengthToString(EDataType eDataType, Object instanceValue) {
-		if (instanceValue == null) return null;
+		if (instanceValue == null) {
+			return null;
+		}
 		if (DatatypesPackage.Literals.LENGTH.isInstance(instanceValue)) {
 			try {
 				String value = convertLengthToString(DatatypesPackage.Literals.LENGTH, instanceValue);
-				if (value != null) return value;
-			}
-			catch (Exception e) {
+				if (value != null) {
+					return value;
+				}
+			} catch (Exception e) {
 				// Keep trying other member types until all have failed.
 			}
 		}
 		if (DatatypesPackage.Literals.MULTI_LENGTH_MEMBER1.isInstance(instanceValue)) {
 			try {
 				String value = convertMultiLengthMember1ToString(DatatypesPackage.Literals.MULTI_LENGTH_MEMBER1, instanceValue);
-				if (value != null) return value;
-			}
-			catch (Exception e) {
+				if (value != null) {
+					return value;
+				}
+			} catch (Exception e) {
 				// Keep trying other member types until all have failed.
 			}
 		}
-		throw new IllegalArgumentException("Invalid value: '"+instanceValue+"' for datatype :"+eDataType.getName());
+		throw new IllegalArgumentException("Invalid value: '" + instanceValue + "' for datatype :" + eDataType.getName()); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createMultiLengthMember1FromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertMultiLengthMember1ToString(EDataType eDataType, Object instanceValue) {
@@ -895,17 +931,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createMultiLengthsFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertMultiLengthsToString(EDataType eDataType, Object instanceValue) {
@@ -913,17 +949,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger createNumberFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.NON_NEGATIVE_INTEGER, initialValue);
+		return (BigInteger) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.NON_NEGATIVE_INTEGER, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertNumberToString(EDataType eDataType, Object instanceValue) {
@@ -931,17 +967,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger createPixelsFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.NON_NEGATIVE_INTEGER, initialValue);
+		return (BigInteger) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.NON_NEGATIVE_INTEGER, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertPixelsToString(EDataType eDataType, Object instanceValue) {
@@ -949,17 +985,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createSafeCURIEFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertSafeCURIEToString(EDataType eDataType, Object instanceValue) {
@@ -967,12 +1003,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public List<String> createSafeCURIEsFromString(EDataType eDataType, String initialValue) {
-		if (initialValue == null) return null;
+		if (initialValue == null) {
+			return null;
+		}
 		List<String> result = new ArrayList<String>();
 		for (String item : split(initialValue)) {
 			result.add(createSafeCURIEFromString(DatatypesPackage.Literals.SAFE_CURIE, item));
@@ -981,14 +1019,18 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertSafeCURIEsToString(EDataType eDataType, Object instanceValue) {
-		if (instanceValue == null) return null;
-		List<?> list = (List<?>)instanceValue;
-		if (list.isEmpty()) return "";
+		if (instanceValue == null) {
+			return null;
+		}
+		List<?> list = (List<?>) instanceValue;
+		if (list.isEmpty()) {
+			return ""; //$NON-NLS-1$
+		}
 		StringBuffer result = new StringBuffer();
 		for (Object item : list) {
 			result.append(convertSafeCURIEToString(DatatypesPackage.Literals.SAFE_CURIE, item));
@@ -998,17 +1040,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createScriptFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertScriptToString(EDataType eDataType, Object instanceValue) {
@@ -1016,17 +1058,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createTextFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertTextToString(EDataType eDataType, Object instanceValue) {
@@ -1034,17 +1076,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createURIFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.ANY_URI, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.ANY_URI, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertURIToString(EDataType eDataType, Object instanceValue) {
@@ -1052,21 +1094,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createURIorSafeCURIEFromString(EDataType eDataType, String initialValue) {
-		if (initialValue == null) return null;
+		if (initialValue == null) {
+			return null;
+		}
 		String result = null;
 		RuntimeException exception = null;
 		try {
-			result = (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.ANY_URI, initialValue);
+			result = (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.ANY_URI, initialValue);
 			if (result != null && Diagnostician.INSTANCE.validate(eDataType, result, null, null)) {
 				return result;
 			}
-		}
-		catch (RuntimeException e) {
+		} catch (RuntimeException e) {
 			exception = e;
 		}
 		try {
@@ -1074,50 +1117,57 @@
 			if (result != null && Diagnostician.INSTANCE.validate(eDataType, result, null, null)) {
 				return result;
 			}
-		}
-		catch (RuntimeException e) {
+		} catch (RuntimeException e) {
 			exception = e;
 		}
-		if (result != null || exception == null) return result;
-    
+		if (result != null || exception == null) {
+			return result;
+		}
+
 		throw exception;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertURIorSafeCURIEToString(EDataType eDataType, Object instanceValue) {
-		if (instanceValue == null) return null;
+		if (instanceValue == null) {
+			return null;
+		}
 		if (XMLTypePackage.Literals.ANY_URI.isInstance(instanceValue)) {
 			try {
 				String value = XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.ANY_URI, instanceValue);
-				if (value != null) return value;
-			}
-			catch (Exception e) {
+				if (value != null) {
+					return value;
+				}
+			} catch (Exception e) {
 				// Keep trying other member types until all have failed.
 			}
 		}
 		if (DatatypesPackage.Literals.SAFE_CURIE.isInstance(instanceValue)) {
 			try {
 				String value = convertSafeCURIEToString(DatatypesPackage.Literals.SAFE_CURIE, instanceValue);
-				if (value != null) return value;
-			}
-			catch (Exception e) {
+				if (value != null) {
+					return value;
+				}
+			} catch (Exception e) {
 				// Keep trying other member types until all have failed.
 			}
 		}
-		throw new IllegalArgumentException("Invalid value: '"+instanceValue+"' for datatype :"+eDataType.getName());
+		throw new IllegalArgumentException("Invalid value: '" + instanceValue + "' for datatype :" + eDataType.getName()); //$NON-NLS-1$//$NON-NLS-2$
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public List<String> createURIorSafeCURIEsFromString(EDataType eDataType, String initialValue) {
-		if (initialValue == null) return null;
+		if (initialValue == null) {
+			return null;
+		}
 		List<String> result = new ArrayList<String>();
 		for (String item : split(initialValue)) {
 			result.add(createURIorSafeCURIEFromString(DatatypesPackage.Literals.UR_IOR_SAFE_CURIE, item));
@@ -1126,14 +1176,18 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertURIorSafeCURIEsToString(EDataType eDataType, Object instanceValue) {
-		if (instanceValue == null) return null;
-		List<?> list = (List<?>)instanceValue;
-		if (list.isEmpty()) return "";
+		if (instanceValue == null) {
+			return null;
+		}
+		List<?> list = (List<?>) instanceValue;
+		if (list.isEmpty()) {
+			return ""; //$NON-NLS-1$
+		}
 		StringBuffer result = new StringBuffer();
 		for (Object item : list) {
 			result.append(convertURIorSafeCURIEToString(DatatypesPackage.Literals.UR_IOR_SAFE_CURIE, item));
@@ -1143,17 +1197,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createURIREFFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
+		return (String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertURIREFToString(EDataType eDataType, Object instanceValue) {
@@ -1161,28 +1215,34 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public List<String> createURIsFromString(EDataType eDataType, String initialValue) {
-		if (initialValue == null) return null;
+		if (initialValue == null) {
+			return null;
+		}
 		List<String> result = new ArrayList<String>();
 		for (String item : split(initialValue)) {
-			result.add((String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.ANY_URI, item));
+			result.add((String) XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.ANY_URI, item));
 		}
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertURIsToString(EDataType eDataType, Object instanceValue) {
-		if (instanceValue == null) return null;
-		List<?> list = (List<?>)instanceValue;
-		if (list.isEmpty()) return "";
+		if (instanceValue == null) {
+			return null;
+		}
+		List<?> list = (List<?>) instanceValue;
+		if (list.isEmpty()) {
+			return ""; //$NON-NLS-1$
+		}
 		StringBuffer result = new StringBuffer();
 		for (Object item : list) {
 			result.append(XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.ANY_URI, item));
@@ -1192,17 +1252,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypesPackage getDatatypesPackage() {
-		return (DatatypesPackage)getEPackage();
+		return (DatatypesPackage) getEPackage();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -1211,4 +1271,4 @@
 		return DatatypesPackage.eINSTANCE;
 	}
 
-} //DatatypesFactoryImpl
+} // DatatypesFactoryImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/impl/DatatypesPackageImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/impl/DatatypesPackageImpl.java
index 3c3ffe8..5fab6cf 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/impl/DatatypesPackageImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/impl/DatatypesPackageImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,7 +12,6 @@
 package org.eclipse.rmf.reqif10.datatypes.impl;
 
 import java.math.BigInteger;
-
 import java.util.List;
 
 import javax.xml.datatype.XMLGregorianCalendar;
@@ -21,289 +20,281 @@
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EValidator;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage;
 import org.eclipse.rmf.reqif10.datatypes.DatatypesFactory;
 import org.eclipse.rmf.reqif10.datatypes.DatatypesPackage;
 import org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0;
-
 import org.eclipse.rmf.reqif10.datatypes.util.DatatypesValidator;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
-
 import org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPackage {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum frameTargetMember0EEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType cdataEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType characterEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType charsetEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType charsetsEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType colorEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType colorMember1EDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType contentTypeEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType contentTypesEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType curieEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType curiEsEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType datetimeEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType fpiEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType frameTargetEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType frameTargetMember0ObjectEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType frameTargetMember1EDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType languageCodeEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType languageCodesEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType lengthEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType lengthMember1EDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType linkTypesEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType mediaDescEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType multiLengthEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType multiLengthMember1EDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType multiLengthsEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType numberEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType pixelsEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType safeCURIEEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType safeCURIEsEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType scriptEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType textEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType uriEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType urIorSafeCURIEEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType urIorSafeCURIEsEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType urirefEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType urIsEDataType = null;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry
+	 * EPackage.Registry} by the package package URI value.
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
+	 * performs initialization of the package, or returns the registered package, if one already exists. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.rmf.reqif10.datatypes.DatatypesPackage#eNS_URI
 	 * @see #init()
@@ -314,29 +305,31 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * <p>
+	 * This method is used to initialize {@link DatatypesPackage#eINSTANCE} when that field is accessed. Clients should
+	 * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
 	 * 
-	 * <p>This method is used to initialize {@link DatatypesPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static DatatypesPackage init() {
-		if (isInited) return (DatatypesPackage)EPackage.Registry.INSTANCE.getEPackage(DatatypesPackage.eNS_URI);
+		if (isInited)
+			return (DatatypesPackage) EPackage.Registry.INSTANCE.getEPackage(DatatypesPackage.eNS_URI);
 
 		// Obtain or create and register package
-		DatatypesPackageImpl theDatatypesPackage = (DatatypesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DatatypesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DatatypesPackageImpl());
+		DatatypesPackageImpl theDatatypesPackage = (DatatypesPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DatatypesPackageImpl ? EPackage.Registry.INSTANCE
+				.get(eNS_URI) : new DatatypesPackageImpl());
 
 		isInited = true;
 
@@ -344,7 +337,8 @@
 		XMLNamespacePackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
-		XhtmlPackageImpl theXhtmlPackage = (XhtmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI) instanceof XhtmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI) : XhtmlPackage.eINSTANCE);
+		XhtmlPackageImpl theXhtmlPackage = (XhtmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI) instanceof XhtmlPackageImpl ? EPackage.Registry.INSTANCE
+				.getEPackage(XhtmlPackage.eNS_URI) : XhtmlPackage.eINSTANCE);
 
 		// Load packages
 		theXhtmlPackage.loadPackage();
@@ -359,26 +353,23 @@
 		theXhtmlPackage.fixPackageContents();
 
 		// Register package validator
-		EValidator.Registry.INSTANCE.put
-			(theDatatypesPackage, 
-			 new EValidator.Descriptor() {
-				 public EValidator getEValidator() {
-					 return DatatypesValidator.INSTANCE;
-				 }
-			 });
+		EValidator.Registry.INSTANCE.put(theDatatypesPackage, new EValidator.Descriptor() {
+			public EValidator getEValidator() {
+				return DatatypesValidator.INSTANCE;
+			}
+		});
 
 		// Mark meta-data to indicate it can't be changed
 		theDatatypesPackage.freeze();
 
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(DatatypesPackage.eNS_URI, theDatatypesPackage);
 		return theDatatypesPackage;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getFrameTargetMember0() {
@@ -386,8 +377,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getCDATA() {
@@ -395,8 +386,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getCharacter() {
@@ -404,8 +395,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getCharset() {
@@ -413,8 +404,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getCharsets() {
@@ -422,8 +413,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getColor() {
@@ -431,8 +422,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getColorMember1() {
@@ -440,8 +431,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getContentType() {
@@ -449,8 +440,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getContentTypes() {
@@ -458,8 +449,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getCURIE() {
@@ -467,8 +458,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getCURIEs() {
@@ -476,8 +467,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getDatetime() {
@@ -485,8 +476,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getFPI() {
@@ -494,8 +485,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getFrameTarget() {
@@ -503,8 +494,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getFrameTargetMember0Object() {
@@ -512,8 +503,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getFrameTargetMember1() {
@@ -521,8 +512,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getLanguageCode() {
@@ -530,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getLanguageCodes() {
@@ -539,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getLength() {
@@ -548,8 +539,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getLengthMember1() {
@@ -557,8 +548,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getLinkTypes() {
@@ -566,8 +557,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getMediaDesc() {
@@ -575,8 +566,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getMultiLength() {
@@ -584,8 +575,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getMultiLengthMember1() {
@@ -593,8 +584,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getMultiLengths() {
@@ -602,8 +593,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getNumber() {
@@ -611,8 +602,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getPixels() {
@@ -620,8 +611,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getSafeCURIE() {
@@ -629,8 +620,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getSafeCURIEs() {
@@ -638,8 +629,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getScript() {
@@ -647,8 +638,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getText() {
@@ -656,8 +647,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getURI() {
@@ -665,8 +656,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getURIorSafeCURIE() {
@@ -674,8 +665,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getURIorSafeCURIEs() {
@@ -683,8 +674,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getURIREF() {
@@ -692,8 +683,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getURIs() {
@@ -701,30 +692,30 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypesFactory getDatatypesFactory() {
-		return (DatatypesFactory)getEFactoryInstance();
+		return (DatatypesFactory) getEFactoryInstance();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but
+	 * its first. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if (isCreated)
+			return;
 		isCreated = true;
 
 		// Create enums
@@ -769,21 +760,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
+	 * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if (isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
@@ -792,48 +783,49 @@
 		setNsURI(eNS_URI);
 
 		// Initialize enums and add enum literals
-		initEEnum(frameTargetMember0EEnum, FrameTargetMember0.class, "FrameTargetMember0");
+		initEEnum(frameTargetMember0EEnum, FrameTargetMember0.class, "FrameTargetMember0"); //$NON-NLS-1$
 		addEEnumLiteral(frameTargetMember0EEnum, FrameTargetMember0.BLANK);
 		addEEnumLiteral(frameTargetMember0EEnum, FrameTargetMember0.SELF);
 		addEEnumLiteral(frameTargetMember0EEnum, FrameTargetMember0.PARENT);
 		addEEnumLiteral(frameTargetMember0EEnum, FrameTargetMember0.TOP);
 
 		// Initialize data types
-		initEDataType(cdataEDataType, String.class, "CDATA", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(characterEDataType, String.class, "Character", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(charsetEDataType, String.class, "Charset", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(charsetsEDataType, List.class, "Charsets", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(colorEDataType, String.class, "Color", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(colorMember1EDataType, String.class, "ColorMember1", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(contentTypeEDataType, String.class, "ContentType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(contentTypesEDataType, String.class, "ContentTypes", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(curieEDataType, String.class, "CURIE", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(curiEsEDataType, List.class, "CURIEs", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(datetimeEDataType, XMLGregorianCalendar.class, "Datetime", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(fpiEDataType, String.class, "FPI", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(frameTargetEDataType, Object.class, "FrameTarget", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(frameTargetMember0ObjectEDataType, FrameTargetMember0.class, "FrameTargetMember0Object", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(frameTargetMember1EDataType, String.class, "FrameTargetMember1", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(languageCodeEDataType, String.class, "LanguageCode", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(languageCodesEDataType, String.class, "LanguageCodes", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(lengthEDataType, Object.class, "Length", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(lengthMember1EDataType, String.class, "LengthMember1", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(linkTypesEDataType, List.class, "LinkTypes", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(mediaDescEDataType, String.class, "MediaDesc", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(multiLengthEDataType, Object.class, "MultiLength", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(multiLengthMember1EDataType, String.class, "MultiLengthMember1", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(multiLengthsEDataType, String.class, "MultiLengths", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(numberEDataType, BigInteger.class, "Number", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(pixelsEDataType, BigInteger.class, "Pixels", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(safeCURIEEDataType, String.class, "SafeCURIE", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(safeCURIEsEDataType, List.class, "SafeCURIEs", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(scriptEDataType, String.class, "Script", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(textEDataType, String.class, "Text", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(uriEDataType, String.class, "URI", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(urIorSafeCURIEEDataType, String.class, "URIorSafeCURIE", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(urIorSafeCURIEsEDataType, List.class, "URIorSafeCURIEs", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(urirefEDataType, String.class, "URIREF", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(urIsEDataType, List.class, "URIs", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
+		initEDataType(cdataEDataType, String.class, "CDATA", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(characterEDataType, String.class, "Character", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(charsetEDataType, String.class, "Charset", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(charsetsEDataType, List.class, "Charsets", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(colorEDataType, String.class, "Color", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(colorMember1EDataType, String.class, "ColorMember1", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(contentTypeEDataType, String.class, "ContentType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(contentTypesEDataType, String.class, "ContentTypes", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(curieEDataType, String.class, "CURIE", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(curiEsEDataType, List.class, "CURIEs", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(datetimeEDataType, XMLGregorianCalendar.class, "Datetime", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(fpiEDataType, String.class, "FPI", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(frameTargetEDataType, Object.class, "FrameTarget", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(frameTargetMember0ObjectEDataType, FrameTargetMember0.class,
+				"FrameTargetMember0Object", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(frameTargetMember1EDataType, String.class, "FrameTargetMember1", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(languageCodeEDataType, String.class, "LanguageCode", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(languageCodesEDataType, String.class, "LanguageCodes", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(lengthEDataType, Object.class, "Length", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(lengthMember1EDataType, String.class, "LengthMember1", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(linkTypesEDataType, List.class, "LinkTypes", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(mediaDescEDataType, String.class, "MediaDesc", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(multiLengthEDataType, Object.class, "MultiLength", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(multiLengthMember1EDataType, String.class, "MultiLengthMember1", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(multiLengthsEDataType, String.class, "MultiLengths", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(numberEDataType, BigInteger.class, "Number", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(pixelsEDataType, BigInteger.class, "Pixels", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(safeCURIEEDataType, String.class, "SafeCURIE", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(safeCURIEsEDataType, List.class, "SafeCURIEs", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(scriptEDataType, String.class, "Script", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(textEDataType, String.class, "Text", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(uriEDataType, String.class, "URI", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(urIorSafeCURIEEDataType, String.class, "URIorSafeCURIE", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(urIorSafeCURIEsEDataType, List.class, "URIorSafeCURIEs", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(urirefEDataType, String.class, "URIREF", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(urIsEDataType, List.class, "URIs", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
 		// Create resource
 		createResource(eNS_URI);
@@ -844,275 +836,131 @@
 	}
 
 	/**
-	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";			
-		addAnnotation
-		  (cdataEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "CDATA",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string"
-		   });		
-		addAnnotation
-		  (characterEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "Character",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string",
-			 "length", "1"
-		   });		
-		addAnnotation
-		  (charsetEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "Charset",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string"
-		   });		
-		addAnnotation
-		  (charsetsEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "Charsets",
-			 "itemType", "Charset"
-		   });		
-		addAnnotation
-		  (colorEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "Color",
-			 "memberTypes", "http://www.eclipse.org/emf/2003/XMLType#NMTOKEN Color_._member_._1"
-		   });		
-		addAnnotation
-		  (colorMember1EDataType, 
-		   source, 
-		   new String[] {
-			 "name", "Color_._member_._1",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#token",
-			 "pattern", "#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?"
-		   });		
-		addAnnotation
-		  (contentTypeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "ContentType",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string"
-		   });		
-		addAnnotation
-		  (contentTypesEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "ContentTypes",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string"
-		   });		
-		addAnnotation
-		  (curieEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "CURIE",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string",
-			 "minLength", "1",
-			 "pattern", "(([\\i-[:]][\\c-[:]]*)?:)?.+"
-		   });		
-		addAnnotation
-		  (curiEsEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "CURIEs",
-			 "itemType", "CURIE"
-		   });		
-		addAnnotation
-		  (datetimeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "Datetime",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#dateTime"
-		   });		
-		addAnnotation
-		  (fpiEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "FPI",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#normalizedString"
-		   });		
-		addAnnotation
-		  (frameTargetEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "FrameTarget",
-			 "memberTypes", "FrameTarget_._member_._0 FrameTarget_._member_._1"
-		   });		
-		addAnnotation
-		  (frameTargetMember0EEnum, 
-		   source, 
-		   new String[] {
-			 "name", "FrameTarget_._member_._0"
-		   });		
-		addAnnotation
-		  (frameTargetMember0ObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "FrameTarget_._member_._0:Object",
-			 "baseType", "FrameTarget_._member_._0"
-		   });		
-		addAnnotation
-		  (frameTargetMember1EDataType, 
-		   source, 
-		   new String[] {
-			 "name", "FrameTarget_._member_._1",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string",
-			 "pattern", "[a-zA-Z].*"
-		   });		
-		addAnnotation
-		  (languageCodeEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "LanguageCode",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#language"
-		   });		
-		addAnnotation
-		  (languageCodesEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "LanguageCodes",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string"
-		   });		
-		addAnnotation
-		  (lengthEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "Length",
-			 "memberTypes", "http://www.eclipse.org/emf/2003/XMLType#nonNegativeInteger Length_._member_._1"
-		   });		
-		addAnnotation
-		  (lengthMember1EDataType, 
-		   source, 
-		   new String[] {
-			 "name", "Length_._member_._1",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#token",
-			 "pattern", "\\d+[%25]|\\d*\\.\\d+[%25]"
-		   });		
-		addAnnotation
-		  (linkTypesEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "LinkTypes",
-			 "itemType", "http://www.eclipse.org/emf/2003/XMLType#NMTOKEN"
-		   });		
-		addAnnotation
-		  (mediaDescEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "MediaDesc",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string"
-		   });		
-		addAnnotation
-		  (multiLengthEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "MultiLength",
-			 "memberTypes", "Length MultiLength_._member_._1"
-		   });		
-		addAnnotation
-		  (multiLengthMember1EDataType, 
-		   source, 
-		   new String[] {
-			 "name", "MultiLength_._member_._1",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#token",
-			 "pattern", "\\d*\\*"
-		   });		
-		addAnnotation
-		  (multiLengthsEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "MultiLengths",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string"
-		   });		
-		addAnnotation
-		  (numberEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "Number",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#nonNegativeInteger"
-		   });		
-		addAnnotation
-		  (pixelsEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "Pixels",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#nonNegativeInteger"
-		   });		
-		addAnnotation
-		  (safeCURIEEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "SafeCURIE",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string",
-			 "minLength", "3",
-			 "pattern", "\\[(([\\i-[:]][\\c-[:]]*)?:)?.+\\]"
-		   });		
-		addAnnotation
-		  (safeCURIEsEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "SafeCURIEs",
-			 "itemType", "SafeCURIE"
-		   });		
-		addAnnotation
-		  (scriptEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "Script",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string"
-		   });		
-		addAnnotation
-		  (textEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "Text",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string"
-		   });		
-		addAnnotation
-		  (uriEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "URI",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#anyURI"
-		   });		
-		addAnnotation
-		  (urIorSafeCURIEEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "URIorSafeCURIE",
-			 "memberTypes", "http://www.eclipse.org/emf/2003/XMLType#anyURI SafeCURIE"
-		   });		
-		addAnnotation
-		  (urIorSafeCURIEsEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "URIorSafeCURIEs",
-			 "itemType", "URIorSafeCURIE"
-		   });		
-		addAnnotation
-		  (urirefEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "URIREF",
-			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string",
-			 "minLength", "1",
-			 "pattern", "#\\c*"
-		   });		
-		addAnnotation
-		  (urIsEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "URIs",
-			 "itemType", "http://www.eclipse.org/emf/2003/XMLType#anyURI"
-		   });
+		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$			
+		addAnnotation(cdataEDataType, source, new String[] { "name", "CDATA", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#string" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(characterEDataType, source, new String[] { "name", "Character", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#string", //$NON-NLS-1$ //$NON-NLS-2$
+				"length", "1" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(charsetEDataType, source, new String[] { "name", "Charset", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#string" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(charsetsEDataType, source, new String[] { "name", "Charsets", //$NON-NLS-1$ //$NON-NLS-2$
+				"itemType", "Charset" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(colorEDataType, source, new String[] { "name", "Color", //$NON-NLS-1$ //$NON-NLS-2$
+				"memberTypes", "http://www.eclipse.org/emf/2003/XMLType#NMTOKEN Color_._member_._1" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(colorMember1EDataType, source, new String[] { "name", "Color_._member_._1", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
+				"pattern", "#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(contentTypeEDataType, source, new String[] { "name", "ContentType", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#string" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(contentTypesEDataType, source, new String[] { "name", "ContentTypes", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#string" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(curieEDataType, source, new String[] { "name", "CURIE", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#string", //$NON-NLS-1$ //$NON-NLS-2$
+				"minLength", "1", //$NON-NLS-1$ //$NON-NLS-2$
+				"pattern", "(([\\i-[:]][\\c-[:]]*)?:)?.+" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(curiEsEDataType, source, new String[] { "name", "CURIEs", //$NON-NLS-1$ //$NON-NLS-2$
+				"itemType", "CURIE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datetimeEDataType, source, new String[] { "name", "Datetime", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#dateTime" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(fpiEDataType, source, new String[] { "name", "FPI", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#normalizedString" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(frameTargetEDataType, source, new String[] { "name", "FrameTarget", //$NON-NLS-1$ //$NON-NLS-2$
+				"memberTypes", "FrameTarget_._member_._0 FrameTarget_._member_._1" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(frameTargetMember0EEnum, source, new String[] { "name", "FrameTarget_._member_._0" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(frameTargetMember0ObjectEDataType, source, new String[] { "name", "FrameTarget_._member_._0:Object", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "FrameTarget_._member_._0" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(frameTargetMember1EDataType, source, new String[] { "name", "FrameTarget_._member_._1", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#string", //$NON-NLS-1$ //$NON-NLS-2$
+				"pattern", "[a-zA-Z].*" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(languageCodeEDataType, source, new String[] { "name", "LanguageCode", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#language" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(languageCodesEDataType, source, new String[] { "name", "LanguageCodes", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#string" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(lengthEDataType, source, new String[] { "name", "Length", //$NON-NLS-1$ //$NON-NLS-2$
+				"memberTypes", "http://www.eclipse.org/emf/2003/XMLType#nonNegativeInteger Length_._member_._1" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(lengthMember1EDataType, source, new String[] { "name", "Length_._member_._1", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
+				"pattern", "\\d+[%25]|\\d*\\.\\d+[%25]" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(linkTypesEDataType, source, new String[] { "name", "LinkTypes", //$NON-NLS-1$ //$NON-NLS-2$
+				"itemType", "http://www.eclipse.org/emf/2003/XMLType#NMTOKEN" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(mediaDescEDataType, source, new String[] { "name", "MediaDesc", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#string" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(multiLengthEDataType, source, new String[] { "name", "MultiLength", //$NON-NLS-1$ //$NON-NLS-2$
+				"memberTypes", "Length MultiLength_._member_._1" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(multiLengthMember1EDataType, source, new String[] { "name", "MultiLength_._member_._1", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
+				"pattern", "\\d*\\*" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(multiLengthsEDataType, source, new String[] { "name", "MultiLengths", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#string" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(numberEDataType, source, new String[] { "name", "Number", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#nonNegativeInteger" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(pixelsEDataType, source, new String[] { "name", "Pixels", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#nonNegativeInteger" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(safeCURIEEDataType, source, new String[] { "name", "SafeCURIE", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#string", //$NON-NLS-1$ //$NON-NLS-2$
+				"minLength", "3", //$NON-NLS-1$ //$NON-NLS-2$
+				"pattern", "\\[(([\\i-[:]][\\c-[:]]*)?:)?.+\\]" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(safeCURIEsEDataType, source, new String[] { "name", "SafeCURIEs", //$NON-NLS-1$ //$NON-NLS-2$
+				"itemType", "SafeCURIE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(scriptEDataType, source, new String[] { "name", "Script", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#string" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(textEDataType, source, new String[] { "name", "Text", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#string" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(uriEDataType, source, new String[] { "name", "URI", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#anyURI" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(urIorSafeCURIEEDataType, source, new String[] { "name", "URIorSafeCURIE", //$NON-NLS-1$ //$NON-NLS-2$
+				"memberTypes", "http://www.eclipse.org/emf/2003/XMLType#anyURI SafeCURIE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(urIorSafeCURIEsEDataType, source, new String[] { "name", "URIorSafeCURIEs", //$NON-NLS-1$ //$NON-NLS-2$
+				"itemType", "URIorSafeCURIE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(urirefEDataType, source, new String[] { "name", "URIREF", //$NON-NLS-1$ //$NON-NLS-2$
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#string", //$NON-NLS-1$ //$NON-NLS-2$
+				"minLength", "1", //$NON-NLS-1$ //$NON-NLS-2$
+				"pattern", "#\\c*" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(urIsEDataType, source, new String[] { "name", "URIs", //$NON-NLS-1$ //$NON-NLS-2$
+				"itemType", "http://www.eclipse.org/emf/2003/XMLType#anyURI" //$NON-NLS-1$ //$NON-NLS-2$
+		});
 	}
 
-} //DatatypesPackageImpl
+} // DatatypesPackageImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/util/DatatypesResourceFactoryImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/util/DatatypesResourceFactoryImpl.java
index 5caa8d9..4ac7143 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/util/DatatypesResourceFactoryImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/util/DatatypesResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,23 +12,19 @@
 package org.eclipse.rmf.reqif10.datatypes.util;
 
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the package. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.datatypes.util.DatatypesResourceImpl
  * @generated
  */
 public class DatatypesResourceFactoryImpl extends ResourceFactoryImpl {
 	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the resource factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypesResourceFactoryImpl() {
@@ -36,9 +32,8 @@
 	}
 
 	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the resource. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -47,4 +42,4 @@
 		return result;
 	}
 
-} //DatatypesResourceFactoryImpl
+} // DatatypesResourceFactoryImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/util/DatatypesResourceImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/util/DatatypesResourceImpl.java
index 2942e6e..e99b0f1 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/util/DatatypesResourceImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/util/DatatypesResourceImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,26 +12,24 @@
 package org.eclipse.rmf.reqif10.datatypes.util;
 
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Resource </b> associated with the package. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.datatypes.util.DatatypesResourceFactoryImpl
  * @generated
  */
 public class DatatypesResourceImpl extends XMLResourceImpl {
 	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * Creates an instance of the resource. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param uri
+	 *            the URI of the new resource.
 	 * @generated
 	 */
 	public DatatypesResourceImpl(URI uri) {
 		super(uri);
 	}
 
-} //DatatypesResourceImpl
+} // DatatypesResourceImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/util/DatatypesValidator.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/util/DatatypesValidator.java
index 554b927..1832959 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/util/DatatypesValidator.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/util/DatatypesValidator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,7 +12,6 @@
 package org.eclipse.rmf.reqif10.datatypes.util;
 
 import java.math.BigInteger;
-
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -23,72 +22,65 @@
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.util.EObjectValidator;
-
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
 import org.eclipse.emf.ecore.xml.type.util.XMLTypeUtil;
 import org.eclipse.emf.ecore.xml.type.util.XMLTypeValidator;
-
-import org.eclipse.rmf.reqif10.datatypes.*;
+import org.eclipse.rmf.reqif10.datatypes.DatatypesPackage;
+import org.eclipse.rmf.reqif10.datatypes.FrameTargetMember0;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Validator</b> for the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Validator</b> for the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.datatypes.DatatypesPackage
  * @generated
  */
 public class DatatypesValidator extends EObjectValidator {
 	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final DatatypesValidator INSTANCE = new DatatypesValidator();
 
 	/**
-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic
+	 * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
 	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
 	 * @generated
 	 */
-	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.rmf.reqif10.datatypes";
+	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.rmf.reqif10.datatypes"; //$NON-NLS-1$
 
 	/**
-	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;
 
 	/**
-	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a
+	 * derived class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
 
 	/**
-	 * The cached base package validator.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached base package validator. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XMLTypeValidator xmlTypeValidator;
 
 	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypesValidator() {
@@ -97,105 +89,104 @@
 	}
 
 	/**
-	 * Returns the package of this validator switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the package of this validator switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EPackage getEPackage() {
-	  return DatatypesPackage.eINSTANCE;
+		return DatatypesPackage.eINSTANCE;
 	}
 
 	/**
-	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Calls <code>validateXXX</code> for the corresponding classifier of the model. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		switch (classifierID) {
-			case DatatypesPackage.FRAME_TARGET_MEMBER0:
-				return validateFrameTargetMember0((FrameTargetMember0)value, diagnostics, context);
-			case DatatypesPackage.CDATA:
-				return validateCDATA((String)value, diagnostics, context);
-			case DatatypesPackage.CHARACTER:
-				return validateCharacter((String)value, diagnostics, context);
-			case DatatypesPackage.CHARSET:
-				return validateCharset((String)value, diagnostics, context);
-			case DatatypesPackage.CHARSETS:
-				return validateCharsets((List<?>)value, diagnostics, context);
-			case DatatypesPackage.COLOR:
-				return validateColor((String)value, diagnostics, context);
-			case DatatypesPackage.COLOR_MEMBER1:
-				return validateColorMember1((String)value, diagnostics, context);
-			case DatatypesPackage.CONTENT_TYPE:
-				return validateContentType((String)value, diagnostics, context);
-			case DatatypesPackage.CONTENT_TYPES:
-				return validateContentTypes((String)value, diagnostics, context);
-			case DatatypesPackage.CURIE:
-				return validateCURIE((String)value, diagnostics, context);
-			case DatatypesPackage.CURI_ES:
-				return validateCURIEs((List<?>)value, diagnostics, context);
-			case DatatypesPackage.DATETIME:
-				return validateDatetime((XMLGregorianCalendar)value, diagnostics, context);
-			case DatatypesPackage.FPI:
-				return validateFPI((String)value, diagnostics, context);
-			case DatatypesPackage.FRAME_TARGET:
-				return validateFrameTarget(value, diagnostics, context);
-			case DatatypesPackage.FRAME_TARGET_MEMBER0_OBJECT:
-				return validateFrameTargetMember0Object((FrameTargetMember0)value, diagnostics, context);
-			case DatatypesPackage.FRAME_TARGET_MEMBER1:
-				return validateFrameTargetMember1((String)value, diagnostics, context);
-			case DatatypesPackage.LANGUAGE_CODE:
-				return validateLanguageCode((String)value, diagnostics, context);
-			case DatatypesPackage.LANGUAGE_CODES:
-				return validateLanguageCodes((String)value, diagnostics, context);
-			case DatatypesPackage.LENGTH:
-				return validateLength(value, diagnostics, context);
-			case DatatypesPackage.LENGTH_MEMBER1:
-				return validateLengthMember1((String)value, diagnostics, context);
-			case DatatypesPackage.LINK_TYPES:
-				return validateLinkTypes((List<?>)value, diagnostics, context);
-			case DatatypesPackage.MEDIA_DESC:
-				return validateMediaDesc((String)value, diagnostics, context);
-			case DatatypesPackage.MULTI_LENGTH:
-				return validateMultiLength(value, diagnostics, context);
-			case DatatypesPackage.MULTI_LENGTH_MEMBER1:
-				return validateMultiLengthMember1((String)value, diagnostics, context);
-			case DatatypesPackage.MULTI_LENGTHS:
-				return validateMultiLengths((String)value, diagnostics, context);
-			case DatatypesPackage.NUMBER:
-				return validateNumber((BigInteger)value, diagnostics, context);
-			case DatatypesPackage.PIXELS:
-				return validatePixels((BigInteger)value, diagnostics, context);
-			case DatatypesPackage.SAFE_CURIE:
-				return validateSafeCURIE((String)value, diagnostics, context);
-			case DatatypesPackage.SAFE_CURI_ES:
-				return validateSafeCURIEs((List<?>)value, diagnostics, context);
-			case DatatypesPackage.SCRIPT:
-				return validateScript((String)value, diagnostics, context);
-			case DatatypesPackage.TEXT:
-				return validateText((String)value, diagnostics, context);
-			case DatatypesPackage.URI:
-				return validateURI((String)value, diagnostics, context);
-			case DatatypesPackage.UR_IOR_SAFE_CURIE:
-				return validateURIorSafeCURIE((String)value, diagnostics, context);
-			case DatatypesPackage.UR_IOR_SAFE_CURI_ES:
-				return validateURIorSafeCURIEs((List<?>)value, diagnostics, context);
-			case DatatypesPackage.URIREF:
-				return validateURIREF((String)value, diagnostics, context);
-			case DatatypesPackage.UR_IS:
-				return validateURIs((List<?>)value, diagnostics, context);
-			default:
-				return true;
+		case DatatypesPackage.FRAME_TARGET_MEMBER0:
+			return validateFrameTargetMember0((FrameTargetMember0) value, diagnostics, context);
+		case DatatypesPackage.CDATA:
+			return validateCDATA((String) value, diagnostics, context);
+		case DatatypesPackage.CHARACTER:
+			return validateCharacter((String) value, diagnostics, context);
+		case DatatypesPackage.CHARSET:
+			return validateCharset((String) value, diagnostics, context);
+		case DatatypesPackage.CHARSETS:
+			return validateCharsets((List<?>) value, diagnostics, context);
+		case DatatypesPackage.COLOR:
+			return validateColor((String) value, diagnostics, context);
+		case DatatypesPackage.COLOR_MEMBER1:
+			return validateColorMember1((String) value, diagnostics, context);
+		case DatatypesPackage.CONTENT_TYPE:
+			return validateContentType((String) value, diagnostics, context);
+		case DatatypesPackage.CONTENT_TYPES:
+			return validateContentTypes((String) value, diagnostics, context);
+		case DatatypesPackage.CURIE:
+			return validateCURIE((String) value, diagnostics, context);
+		case DatatypesPackage.CURI_ES:
+			return validateCURIEs((List<?>) value, diagnostics, context);
+		case DatatypesPackage.DATETIME:
+			return validateDatetime((XMLGregorianCalendar) value, diagnostics, context);
+		case DatatypesPackage.FPI:
+			return validateFPI((String) value, diagnostics, context);
+		case DatatypesPackage.FRAME_TARGET:
+			return validateFrameTarget(value, diagnostics, context);
+		case DatatypesPackage.FRAME_TARGET_MEMBER0_OBJECT:
+			return validateFrameTargetMember0Object((FrameTargetMember0) value, diagnostics, context);
+		case DatatypesPackage.FRAME_TARGET_MEMBER1:
+			return validateFrameTargetMember1((String) value, diagnostics, context);
+		case DatatypesPackage.LANGUAGE_CODE:
+			return validateLanguageCode((String) value, diagnostics, context);
+		case DatatypesPackage.LANGUAGE_CODES:
+			return validateLanguageCodes((String) value, diagnostics, context);
+		case DatatypesPackage.LENGTH:
+			return validateLength(value, diagnostics, context);
+		case DatatypesPackage.LENGTH_MEMBER1:
+			return validateLengthMember1((String) value, diagnostics, context);
+		case DatatypesPackage.LINK_TYPES:
+			return validateLinkTypes((List<?>) value, diagnostics, context);
+		case DatatypesPackage.MEDIA_DESC:
+			return validateMediaDesc((String) value, diagnostics, context);
+		case DatatypesPackage.MULTI_LENGTH:
+			return validateMultiLength(value, diagnostics, context);
+		case DatatypesPackage.MULTI_LENGTH_MEMBER1:
+			return validateMultiLengthMember1((String) value, diagnostics, context);
+		case DatatypesPackage.MULTI_LENGTHS:
+			return validateMultiLengths((String) value, diagnostics, context);
+		case DatatypesPackage.NUMBER:
+			return validateNumber((BigInteger) value, diagnostics, context);
+		case DatatypesPackage.PIXELS:
+			return validatePixels((BigInteger) value, diagnostics, context);
+		case DatatypesPackage.SAFE_CURIE:
+			return validateSafeCURIE((String) value, diagnostics, context);
+		case DatatypesPackage.SAFE_CURI_ES:
+			return validateSafeCURIEs((List<?>) value, diagnostics, context);
+		case DatatypesPackage.SCRIPT:
+			return validateScript((String) value, diagnostics, context);
+		case DatatypesPackage.TEXT:
+			return validateText((String) value, diagnostics, context);
+		case DatatypesPackage.URI:
+			return validateURI((String) value, diagnostics, context);
+		case DatatypesPackage.UR_IOR_SAFE_CURIE:
+			return validateURIorSafeCURIE((String) value, diagnostics, context);
+		case DatatypesPackage.UR_IOR_SAFE_CURI_ES:
+			return validateURIorSafeCURIEs((List<?>) value, diagnostics, context);
+		case DatatypesPackage.URIREF:
+			return validateURIREF((String) value, diagnostics, context);
+		case DatatypesPackage.UR_IS:
+			return validateURIs((List<?>) value, diagnostics, context);
+		default:
+			return true;
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateFrameTargetMember0(FrameTargetMember0 frameTargetMember0, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -203,8 +194,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateCDATA(String cdata, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -212,47 +203,49 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateCharacter(String character, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		boolean result = validateCharacter_MinLength(character, diagnostics, context);
-		if (result || diagnostics != null) result &= validateCharacter_MaxLength(character, diagnostics, context);
+		if (result || diagnostics != null) {
+			result &= validateCharacter_MaxLength(character, diagnostics, context);
+		}
 		return result;
 	}
 
 	/**
-	 * Validates the MinLength constraint of '<em>Character</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the MinLength constraint of '<em>Character</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateCharacter_MinLength(String character, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		int length = character.length();
 		boolean result = length >= 1;
-		if (!result && diagnostics != null)
+		if (!result && diagnostics != null) {
 			reportMinLengthViolation(DatatypesPackage.Literals.CHARACTER, character, length, 1, diagnostics, context);
+		}
 		return result;
 	}
 
 	/**
-	 * Validates the MaxLength constraint of '<em>Character</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the MaxLength constraint of '<em>Character</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateCharacter_MaxLength(String character, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		int length = character.length();
 		boolean result = length <= 1;
-		if (!result && diagnostics != null)
+		if (!result && diagnostics != null) {
 			reportMaxLengthViolation(DatatypesPackage.Literals.CHARACTER, character, length, 1, diagnostics, context);
+		}
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateCharset(String charset, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -260,8 +253,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateCharsets(List<?> charsets, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -270,19 +263,17 @@
 	}
 
 	/**
-	 * Validates the ItemType constraint of '<em>Charsets</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the ItemType constraint of '<em>Charsets</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateCharsets_ItemType(List<?> charsets, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		boolean result = true;
-		for (Iterator<?> i = charsets.iterator(); i.hasNext() && (result || diagnostics != null); ) {
+		for (Iterator<?> i = charsets.iterator(); i.hasNext() && (result || diagnostics != null);) {
 			Object item = i.next();
 			if (DatatypesPackage.Literals.CHARSET.isInstance(item)) {
-				result &= validateCharset((String)item, diagnostics, context);
-			}
-			else {
+				result &= validateCharset((String) item, diagnostics, context);
+			} else {
 				result = false;
 				reportDataValueTypeViolation(DatatypesPackage.Literals.CHARSET, item, diagnostics, context);
 			}
@@ -291,8 +282,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateColor(String color, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -301,38 +292,44 @@
 	}
 
 	/**
-	 * Validates the MemberTypes constraint of '<em>Color</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the MemberTypes constraint of '<em>Color</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateColor_MemberTypes(String color, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		if (diagnostics != null) {
 			BasicDiagnostic tempDiagnostics = new BasicDiagnostic();
 			if (XMLTypePackage.Literals.NMTOKEN.isInstance(color)) {
-				if (xmlTypeValidator.validateNMTOKEN(color, tempDiagnostics, context)) return true;
+				if (xmlTypeValidator.validateNMTOKEN(color, tempDiagnostics, context)) {
+					return true;
+				}
 			}
 			if (DatatypesPackage.Literals.COLOR_MEMBER1.isInstance(color)) {
-				if (validateColorMember1(color, tempDiagnostics, context)) return true;
+				if (validateColorMember1(color, tempDiagnostics, context)) {
+					return true;
+				}
 			}
 			for (Diagnostic diagnostic : tempDiagnostics.getChildren()) {
 				diagnostics.add(diagnostic);
 			}
-		}
-		else {
+		} else {
 			if (XMLTypePackage.Literals.NMTOKEN.isInstance(color)) {
-				if (xmlTypeValidator.validateNMTOKEN(color, null, context)) return true;
+				if (xmlTypeValidator.validateNMTOKEN(color, null, context)) {
+					return true;
+				}
 			}
 			if (DatatypesPackage.Literals.COLOR_MEMBER1.isInstance(color)) {
-				if (validateColorMember1(color, null, context)) return true;
+				if (validateColorMember1(color, null, context)) {
+					return true;
+				}
 			}
 		}
 		return false;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateColorMember1(String colorMember1, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -341,22 +338,18 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @see #validateColorMember1_Pattern
 	 */
-	public static final  PatternMatcher [][] COLOR_MEMBER1__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?")
-			}
-		};
+	public static final PatternMatcher[][] COLOR_MEMBER1__PATTERN__VALUES = new PatternMatcher[][] { new PatternMatcher[] { XMLTypeUtil
+			.createPatternMatcher("#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?") //$NON-NLS-1$
+	} };
 
 	/**
-	 * Validates the Pattern constraint of '<em>Color Member1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the Pattern constraint of '<em>Color Member1</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateColorMember1_Pattern(String colorMember1, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -364,8 +357,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateContentType(String contentType, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -373,8 +366,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateContentTypes(String contentTypes, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -382,33 +375,30 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateCURIE(String curie, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		boolean result = validateCURIE_Pattern(curie, diagnostics, context);
-		if (result || diagnostics != null) result &= validateCURIE_MinLength(curie, diagnostics, context);
+		if (result || diagnostics != null) {
+			result &= validateCURIE_MinLength(curie, diagnostics, context);
+		}
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @see #validateCURIE_Pattern
 	 */
-	public static final  PatternMatcher [][] CURIE__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("(([\\i-[:]][\\c-[:]]*)?:)?.+")
-			}
-		};
+	public static final PatternMatcher[][] CURIE__PATTERN__VALUES = new PatternMatcher[][] { new PatternMatcher[] { XMLTypeUtil
+			.createPatternMatcher("(([\\i-[:]][\\c-[:]]*)?:)?.+") } }; //$NON-NLS-1$
 
 	/**
-	 * Validates the Pattern constraint of '<em>CURIE</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the Pattern constraint of '<em>CURIE</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateCURIE_Pattern(String curie, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -416,22 +406,22 @@
 	}
 
 	/**
-	 * Validates the MinLength constraint of '<em>CURIE</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the MinLength constraint of '<em>CURIE</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateCURIE_MinLength(String curie, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		int length = curie.length();
 		boolean result = length >= 1;
-		if (!result && diagnostics != null)
+		if (!result && diagnostics != null) {
 			reportMinLengthViolation(DatatypesPackage.Literals.CURIE, curie, length, 1, diagnostics, context);
+		}
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateCURIEs(List<?> curiEs, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -440,19 +430,17 @@
 	}
 
 	/**
-	 * Validates the ItemType constraint of '<em>CURI Es</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the ItemType constraint of '<em>CURI Es</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateCURIEs_ItemType(List<?> curiEs, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		boolean result = true;
-		for (Iterator<?> i = curiEs.iterator(); i.hasNext() && (result || diagnostics != null); ) {
+		for (Iterator<?> i = curiEs.iterator(); i.hasNext() && (result || diagnostics != null);) {
 			Object item = i.next();
 			if (DatatypesPackage.Literals.CURIE.isInstance(item)) {
-				result &= validateCURIE((String)item, diagnostics, context);
-			}
-			else {
+				result &= validateCURIE((String) item, diagnostics, context);
+			} else {
 				result = false;
 				reportDataValueTypeViolation(DatatypesPackage.Literals.CURIE, item, diagnostics, context);
 			}
@@ -461,8 +449,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateDatetime(XMLGregorianCalendar datetime, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -470,8 +458,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateFPI(String fpi, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -479,8 +467,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateFrameTarget(Object frameTarget, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -489,47 +477,54 @@
 	}
 
 	/**
-	 * Validates the MemberTypes constraint of '<em>Frame Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the MemberTypes constraint of '<em>Frame Target</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateFrameTarget_MemberTypes(Object frameTarget, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		if (diagnostics != null) {
 			BasicDiagnostic tempDiagnostics = new BasicDiagnostic();
 			if (DatatypesPackage.Literals.FRAME_TARGET_MEMBER0.isInstance(frameTarget)) {
-				if (validateFrameTargetMember0((FrameTargetMember0)frameTarget, tempDiagnostics, context)) return true;
+				if (validateFrameTargetMember0((FrameTargetMember0) frameTarget, tempDiagnostics, context)) {
+					return true;
+				}
 			}
 			if (DatatypesPackage.Literals.FRAME_TARGET_MEMBER1.isInstance(frameTarget)) {
-				if (validateFrameTargetMember1((String)frameTarget, tempDiagnostics, context)) return true;
+				if (validateFrameTargetMember1((String) frameTarget, tempDiagnostics, context)) {
+					return true;
+				}
 			}
 			for (Diagnostic diagnostic : tempDiagnostics.getChildren()) {
 				diagnostics.add(diagnostic);
 			}
-		}
-		else {
+		} else {
 			if (DatatypesPackage.Literals.FRAME_TARGET_MEMBER0.isInstance(frameTarget)) {
-				if (validateFrameTargetMember0((FrameTargetMember0)frameTarget, null, context)) return true;
+				if (validateFrameTargetMember0((FrameTargetMember0) frameTarget, null, context)) {
+					return true;
+				}
 			}
 			if (DatatypesPackage.Literals.FRAME_TARGET_MEMBER1.isInstance(frameTarget)) {
-				if (validateFrameTargetMember1((String)frameTarget, null, context)) return true;
+				if (validateFrameTargetMember1((String) frameTarget, null, context)) {
+					return true;
+				}
 			}
 		}
 		return false;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateFrameTargetMember0Object(FrameTargetMember0 frameTargetMember0Object, DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateFrameTargetMember0Object(FrameTargetMember0 frameTargetMember0Object, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return true;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateFrameTargetMember1(String frameTargetMember1, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -538,31 +533,28 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @see #validateFrameTargetMember1_Pattern
 	 */
-	public static final  PatternMatcher [][] FRAME_TARGET_MEMBER1__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("[a-zA-Z].*")
-			}
-		};
+	public static final PatternMatcher[][] FRAME_TARGET_MEMBER1__PATTERN__VALUES = new PatternMatcher[][] { new PatternMatcher[] { XMLTypeUtil
+			.createPatternMatcher("[a-zA-Z].*") } }; //$NON-NLS-1$
 
 	/**
-	 * Validates the Pattern constraint of '<em>Frame Target Member1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the Pattern constraint of '<em>Frame Target Member1</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateFrameTargetMember1_Pattern(String frameTargetMember1, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validatePattern(DatatypesPackage.Literals.FRAME_TARGET_MEMBER1, frameTargetMember1, FRAME_TARGET_MEMBER1__PATTERN__VALUES, diagnostics, context);
+		return validatePattern(DatatypesPackage.Literals.FRAME_TARGET_MEMBER1, frameTargetMember1, FRAME_TARGET_MEMBER1__PATTERN__VALUES,
+				diagnostics, context);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateLanguageCode(String languageCode, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -571,8 +563,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateLanguageCodes(String languageCodes, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -580,8 +572,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateLength(Object length, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -590,38 +582,44 @@
 	}
 
 	/**
-	 * Validates the MemberTypes constraint of '<em>Length</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the MemberTypes constraint of '<em>Length</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateLength_MemberTypes(Object length, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		if (diagnostics != null) {
 			BasicDiagnostic tempDiagnostics = new BasicDiagnostic();
 			if (XMLTypePackage.Literals.NON_NEGATIVE_INTEGER.isInstance(length)) {
-				if (xmlTypeValidator.validateNonNegativeInteger((BigInteger)length, tempDiagnostics, context)) return true;
+				if (xmlTypeValidator.validateNonNegativeInteger((BigInteger) length, tempDiagnostics, context)) {
+					return true;
+				}
 			}
 			if (DatatypesPackage.Literals.LENGTH_MEMBER1.isInstance(length)) {
-				if (validateLengthMember1((String)length, tempDiagnostics, context)) return true;
+				if (validateLengthMember1((String) length, tempDiagnostics, context)) {
+					return true;
+				}
 			}
 			for (Diagnostic diagnostic : tempDiagnostics.getChildren()) {
 				diagnostics.add(diagnostic);
 			}
-		}
-		else {
+		} else {
 			if (XMLTypePackage.Literals.NON_NEGATIVE_INTEGER.isInstance(length)) {
-				if (xmlTypeValidator.validateNonNegativeInteger((BigInteger)length, null, context)) return true;
+				if (xmlTypeValidator.validateNonNegativeInteger((BigInteger) length, null, context)) {
+					return true;
+				}
 			}
 			if (DatatypesPackage.Literals.LENGTH_MEMBER1.isInstance(length)) {
-				if (validateLengthMember1((String)length, null, context)) return true;
+				if (validateLengthMember1((String) length, null, context)) {
+					return true;
+				}
 			}
 		}
 		return false;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateLengthMember1(String lengthMember1, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -630,22 +628,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @see #validateLengthMember1_Pattern
 	 */
-	public static final  PatternMatcher [][] LENGTH_MEMBER1__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("\\d+[%]|\\d*\\.\\d+[%]")
-			}
-		};
+	public static final PatternMatcher[][] LENGTH_MEMBER1__PATTERN__VALUES = new PatternMatcher[][] { new PatternMatcher[] { XMLTypeUtil
+			.createPatternMatcher("\\d+[%]|\\d*\\.\\d+[%]") } }; //$NON-NLS-1$
 
 	/**
-	 * Validates the Pattern constraint of '<em>Length Member1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the Pattern constraint of '<em>Length Member1</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateLengthMember1_Pattern(String lengthMember1, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -653,8 +646,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateLinkTypes(List<?> linkTypes, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -663,19 +656,17 @@
 	}
 
 	/**
-	 * Validates the ItemType constraint of '<em>Link Types</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the ItemType constraint of '<em>Link Types</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateLinkTypes_ItemType(List<?> linkTypes, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		boolean result = true;
-		for (Iterator<?> i = linkTypes.iterator(); i.hasNext() && (result || diagnostics != null); ) {
+		for (Iterator<?> i = linkTypes.iterator(); i.hasNext() && (result || diagnostics != null);) {
 			Object item = i.next();
 			if (XMLTypePackage.Literals.NMTOKEN.isInstance(item)) {
-				result &= xmlTypeValidator.validateNMTOKEN((String)item, diagnostics, context);
-			}
-			else {
+				result &= xmlTypeValidator.validateNMTOKEN((String) item, diagnostics, context);
+			} else {
 				result = false;
 				reportDataValueTypeViolation(XMLTypePackage.Literals.NMTOKEN, item, diagnostics, context);
 			}
@@ -684,8 +675,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateMediaDesc(String mediaDesc, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -693,8 +684,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateMultiLength(Object multiLength, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -703,38 +694,44 @@
 	}
 
 	/**
-	 * Validates the MemberTypes constraint of '<em>Multi Length</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the MemberTypes constraint of '<em>Multi Length</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateMultiLength_MemberTypes(Object multiLength, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		if (diagnostics != null) {
 			BasicDiagnostic tempDiagnostics = new BasicDiagnostic();
 			if (DatatypesPackage.Literals.LENGTH.isInstance(multiLength)) {
-				if (validateLength(multiLength, tempDiagnostics, context)) return true;
+				if (validateLength(multiLength, tempDiagnostics, context)) {
+					return true;
+				}
 			}
 			if (DatatypesPackage.Literals.MULTI_LENGTH_MEMBER1.isInstance(multiLength)) {
-				if (validateMultiLengthMember1((String)multiLength, tempDiagnostics, context)) return true;
+				if (validateMultiLengthMember1((String) multiLength, tempDiagnostics, context)) {
+					return true;
+				}
 			}
 			for (Diagnostic diagnostic : tempDiagnostics.getChildren()) {
 				diagnostics.add(diagnostic);
 			}
-		}
-		else {
+		} else {
 			if (DatatypesPackage.Literals.LENGTH.isInstance(multiLength)) {
-				if (validateLength(multiLength, null, context)) return true;
+				if (validateLength(multiLength, null, context)) {
+					return true;
+				}
 			}
 			if (DatatypesPackage.Literals.MULTI_LENGTH_MEMBER1.isInstance(multiLength)) {
-				if (validateMultiLengthMember1((String)multiLength, null, context)) return true;
+				if (validateMultiLengthMember1((String) multiLength, null, context)) {
+					return true;
+				}
 			}
 		}
 		return false;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateMultiLengthMember1(String multiLengthMember1, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -743,31 +740,28 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @see #validateMultiLengthMember1_Pattern
 	 */
-	public static final  PatternMatcher [][] MULTI_LENGTH_MEMBER1__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("\\d*\\*")
-			}
-		};
+	public static final PatternMatcher[][] MULTI_LENGTH_MEMBER1__PATTERN__VALUES = new PatternMatcher[][] { new PatternMatcher[] { XMLTypeUtil
+			.createPatternMatcher("\\d*\\*") } }; //$NON-NLS-1$
 
 	/**
-	 * Validates the Pattern constraint of '<em>Multi Length Member1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the Pattern constraint of '<em>Multi Length Member1</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateMultiLengthMember1_Pattern(String multiLengthMember1, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validatePattern(DatatypesPackage.Literals.MULTI_LENGTH_MEMBER1, multiLengthMember1, MULTI_LENGTH_MEMBER1__PATTERN__VALUES, diagnostics, context);
+		return validatePattern(DatatypesPackage.Literals.MULTI_LENGTH_MEMBER1, multiLengthMember1, MULTI_LENGTH_MEMBER1__PATTERN__VALUES,
+				diagnostics, context);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateMultiLengths(String multiLengths, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -775,8 +769,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateNumber(BigInteger number, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -785,8 +779,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validatePixels(BigInteger pixels, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -795,33 +789,30 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateSafeCURIE(String safeCURIE, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		boolean result = validateSafeCURIE_Pattern(safeCURIE, diagnostics, context);
-		if (result || diagnostics != null) result &= validateSafeCURIE_MinLength(safeCURIE, diagnostics, context);
+		if (result || diagnostics != null) {
+			result &= validateSafeCURIE_MinLength(safeCURIE, diagnostics, context);
+		}
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @see #validateSafeCURIE_Pattern
 	 */
-	public static final  PatternMatcher [][] SAFE_CURIE__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("\\[(([\\i-[:]][\\c-[:]]*)?:)?.+\\]")
-			}
-		};
+	public static final PatternMatcher[][] SAFE_CURIE__PATTERN__VALUES = new PatternMatcher[][] { new PatternMatcher[] { XMLTypeUtil
+			.createPatternMatcher("\\[(([\\i-[:]][\\c-[:]]*)?:)?.+\\]") } }; //$NON-NLS-1$
 
 	/**
-	 * Validates the Pattern constraint of '<em>Safe CURIE</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the Pattern constraint of '<em>Safe CURIE</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateSafeCURIE_Pattern(String safeCURIE, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -829,22 +820,22 @@
 	}
 
 	/**
-	 * Validates the MinLength constraint of '<em>Safe CURIE</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the MinLength constraint of '<em>Safe CURIE</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateSafeCURIE_MinLength(String safeCURIE, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		int length = safeCURIE.length();
 		boolean result = length >= 3;
-		if (!result && diagnostics != null)
+		if (!result && diagnostics != null) {
 			reportMinLengthViolation(DatatypesPackage.Literals.SAFE_CURIE, safeCURIE, length, 3, diagnostics, context);
+		}
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateSafeCURIEs(List<?> safeCURIEs, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -853,19 +844,17 @@
 	}
 
 	/**
-	 * Validates the ItemType constraint of '<em>Safe CURI Es</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the ItemType constraint of '<em>Safe CURI Es</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateSafeCURIEs_ItemType(List<?> safeCURIEs, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		boolean result = true;
-		for (Iterator<?> i = safeCURIEs.iterator(); i.hasNext() && (result || diagnostics != null); ) {
+		for (Iterator<?> i = safeCURIEs.iterator(); i.hasNext() && (result || diagnostics != null);) {
 			Object item = i.next();
 			if (DatatypesPackage.Literals.SAFE_CURIE.isInstance(item)) {
-				result &= validateSafeCURIE((String)item, diagnostics, context);
-			}
-			else {
+				result &= validateSafeCURIE((String) item, diagnostics, context);
+			} else {
 				result = false;
 				reportDataValueTypeViolation(DatatypesPackage.Literals.SAFE_CURIE, item, diagnostics, context);
 			}
@@ -874,8 +863,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateScript(String script, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -883,8 +872,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateText(String text, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -892,8 +881,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateURI(String uri, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -901,8 +890,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateURIorSafeCURIE(String urIorSafeCURIE, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -911,38 +900,45 @@
 	}
 
 	/**
-	 * Validates the MemberTypes constraint of '<em>UR Ior Safe CURIE</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the MemberTypes constraint of '<em>UR Ior Safe CURIE</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateURIorSafeCURIE_MemberTypes(String urIorSafeCURIE, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		if (diagnostics != null) {
 			BasicDiagnostic tempDiagnostics = new BasicDiagnostic();
 			if (XMLTypePackage.Literals.ANY_URI.isInstance(urIorSafeCURIE)) {
-				if (xmlTypeValidator.validateAnyURI(urIorSafeCURIE, tempDiagnostics, context)) return true;
+				if (xmlTypeValidator.validateAnyURI(urIorSafeCURIE, tempDiagnostics, context)) {
+					return true;
+				}
 			}
 			if (DatatypesPackage.Literals.SAFE_CURIE.isInstance(urIorSafeCURIE)) {
-				if (validateSafeCURIE(urIorSafeCURIE, tempDiagnostics, context)) return true;
+				if (validateSafeCURIE(urIorSafeCURIE, tempDiagnostics, context)) {
+					return true;
+				}
 			}
 			for (Diagnostic diagnostic : tempDiagnostics.getChildren()) {
 				diagnostics.add(diagnostic);
 			}
-		}
-		else {
+		} else {
 			if (XMLTypePackage.Literals.ANY_URI.isInstance(urIorSafeCURIE)) {
-				if (xmlTypeValidator.validateAnyURI(urIorSafeCURIE, null, context)) return true;
+				if (xmlTypeValidator.validateAnyURI(urIorSafeCURIE, null, context)) {
+					return true;
+				}
 			}
 			if (DatatypesPackage.Literals.SAFE_CURIE.isInstance(urIorSafeCURIE)) {
-				if (validateSafeCURIE(urIorSafeCURIE, null, context)) return true;
+				if (validateSafeCURIE(urIorSafeCURIE, null, context)) {
+					return true;
+				}
 			}
 		}
 		return false;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateURIorSafeCURIEs(List<?> urIorSafeCURIEs, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -951,19 +947,18 @@
 	}
 
 	/**
-	 * Validates the ItemType constraint of '<em>UR Ior Safe CURI Es</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the ItemType constraint of '<em>UR Ior Safe CURI Es</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateURIorSafeCURIEs_ItemType(List<?> urIorSafeCURIEs, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		boolean result = true;
-		for (Iterator<?> i = urIorSafeCURIEs.iterator(); i.hasNext() && (result || diagnostics != null); ) {
+		for (Iterator<?> i = urIorSafeCURIEs.iterator(); i.hasNext() && (result || diagnostics != null);) {
 			Object item = i.next();
 			if (DatatypesPackage.Literals.UR_IOR_SAFE_CURIE.isInstance(item)) {
-				result &= validateURIorSafeCURIE((String)item, diagnostics, context);
-			}
-			else {
+				result &= validateURIorSafeCURIE((String) item, diagnostics, context);
+			} else {
 				result = false;
 				reportDataValueTypeViolation(DatatypesPackage.Literals.UR_IOR_SAFE_CURIE, item, diagnostics, context);
 			}
@@ -972,33 +967,30 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateURIREF(String uriref, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		boolean result = validateURIREF_Pattern(uriref, diagnostics, context);
-		if (result || diagnostics != null) result &= validateURIREF_MinLength(uriref, diagnostics, context);
+		if (result || diagnostics != null) {
+			result &= validateURIREF_MinLength(uriref, diagnostics, context);
+		}
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @see #validateURIREF_Pattern
 	 */
-	public static final  PatternMatcher [][] URIREF__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("#\\c*")
-			}
-		};
+	public static final PatternMatcher[][] URIREF__PATTERN__VALUES = new PatternMatcher[][] { new PatternMatcher[] { XMLTypeUtil
+			.createPatternMatcher("#\\c*") } }; //$NON-NLS-1$
 
 	/**
-	 * Validates the Pattern constraint of '<em>URIREF</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the Pattern constraint of '<em>URIREF</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateURIREF_Pattern(String uriref, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -1006,22 +998,22 @@
 	}
 
 	/**
-	 * Validates the MinLength constraint of '<em>URIREF</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the MinLength constraint of '<em>URIREF</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateURIREF_MinLength(String uriref, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		int length = uriref.length();
 		boolean result = length >= 1;
-		if (!result && diagnostics != null)
+		if (!result && diagnostics != null) {
 			reportMinLengthViolation(DatatypesPackage.Literals.URIREF, uriref, length, 1, diagnostics, context);
+		}
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateURIs(List<?> urIs, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -1030,19 +1022,17 @@
 	}
 
 	/**
-	 * Validates the ItemType constraint of '<em>UR Is</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Validates the ItemType constraint of '<em>UR Is</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateURIs_ItemType(List<?> urIs, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		boolean result = true;
-		for (Iterator<?> i = urIs.iterator(); i.hasNext() && (result || diagnostics != null); ) {
+		for (Iterator<?> i = urIs.iterator(); i.hasNext() && (result || diagnostics != null);) {
 			Object item = i.next();
 			if (XMLTypePackage.Literals.ANY_URI.isInstance(item)) {
-				result &= xmlTypeValidator.validateAnyURI((String)item, diagnostics, context);
-			}
-			else {
+				result &= xmlTypeValidator.validateAnyURI((String) item, diagnostics, context);
+			} else {
 				result = false;
 				reportDataValueTypeViolation(XMLTypePackage.Literals.ANY_URI, item, diagnostics, context);
 			}
@@ -1051,9 +1041,9 @@
 	}
 
 	/**
-	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1064,4 +1054,4 @@
 		return super.getResourceLocator();
 	}
 
-} //DatatypesValidator
+} // DatatypesValidator
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/util/DatatypesXMLProcessor.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/util/DatatypesXMLProcessor.java
index 3debb51..09100be 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/util/DatatypesXMLProcessor.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/datatypes/util/DatatypesXMLProcessor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,36 +14,32 @@
 import java.util.Map;
 
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
 import org.eclipse.rmf.reqif10.datatypes.DatatypesPackage;
 
 /**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This class contains helper methods to serialize and deserialize XML documents <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class DatatypesXMLProcessor extends XMLProcessor {
 
 	/**
-	 * Public constructor to instantiate the helper.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Public constructor to instantiate the helper. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypesXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		DatatypesPackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
-	 * Register for "*" and "xml" file extensions the DatatypesResourceFactoryImpl factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Register for "*" and "xml" file extensions the DatatypesResourceFactoryImpl factory. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -56,4 +52,4 @@
 		return registrations;
 	}
 
-} //DatatypesXMLProcessor
+} // DatatypesXMLProcessor
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/AlignType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/AlignType.java
index a5b2815..5d2c238 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/AlignType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/AlignType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,73 +18,67 @@
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Align Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Align Type</b></em>', and utility
+ * methods for working with them. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getAlignType()
  * @model extendedMetaData="name='align_._type'"
  * @generated
  */
 public enum AlignType implements Enumerator {
 	/**
-	 * The '<em><b>Left</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Left</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #LEFT_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	LEFT(0, "left", "left"),
+	LEFT(0, "left", "left"), //$NON-NLS-1$//$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Center</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Center</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #CENTER_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	CENTER(1, "center", "center"),
+	CENTER(1, "center", "center"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Right</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Right</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #RIGHT_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	RIGHT(2, "right", "right"),
+	RIGHT(2, "right", "right"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Justify</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Justify</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #JUSTIFY_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	JUSTIFY(3, "justify", "justify"),
+	JUSTIFY(3, "justify", "justify"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Char</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Char</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #CHAR_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	CHAR(4, "char", "char");
+	CHAR(4, "char", "char"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Left</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Left</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Left</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Left</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #LEFT
 	 * @model name="left"
 	 * @generated
@@ -93,13 +87,13 @@
 	public static final int LEFT_VALUE = 0;
 
 	/**
-	 * The '<em><b>Center</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Center</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Center</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Center</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #CENTER
 	 * @model name="center"
 	 * @generated
@@ -108,13 +102,13 @@
 	public static final int CENTER_VALUE = 1;
 
 	/**
-	 * The '<em><b>Right</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Right</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Right</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Right</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #RIGHT
 	 * @model name="right"
 	 * @generated
@@ -123,13 +117,13 @@
 	public static final int RIGHT_VALUE = 2;
 
 	/**
-	 * The '<em><b>Justify</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Justify</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Justify</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Justify</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #JUSTIFY
 	 * @model name="justify"
 	 * @generated
@@ -138,13 +132,13 @@
 	public static final int JUSTIFY_VALUE = 3;
 
 	/**
-	 * The '<em><b>Char</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Char</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Char</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Char</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #CHAR
 	 * @model name="char"
 	 * @generated
@@ -153,37 +147,28 @@
 	public static final int CHAR_VALUE = 4;
 
 	/**
-	 * An array of all the '<em><b>Align Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * An array of all the '<em><b>Align Type</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final AlignType[] VALUES_ARRAY =
-		new AlignType[] {
-			LEFT,
-			CENTER,
-			RIGHT,
-			JUSTIFY,
-			CHAR,
-		};
+	private static final AlignType[] VALUES_ARRAY = new AlignType[] { LEFT, CENTER, RIGHT, JUSTIFY, CHAR, };
 
 	/**
-	 * A public read-only list of all the '<em><b>Align Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A public read-only list of all the '<em><b>Align Type</b></em>' enumerators. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<AlignType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Align Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Align Type</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static AlignType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AlignType result = VALUES_ARRAY[i];
+		for (AlignType result : VALUES_ARRAY) {
 			if (result.toString().equals(literal)) {
 				return result;
 			}
@@ -192,14 +177,13 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Align Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Align Type</b></em>' literal with the specified name. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static AlignType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AlignType result = VALUES_ARRAY[i];
+		for (AlignType result : VALUES_ARRAY) {
 			if (result.getName().equals(name)) {
 				return result;
 			}
@@ -208,47 +192,51 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Align Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Align Type</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static AlignType get(int value) {
 		switch (value) {
-			case LEFT_VALUE: return LEFT;
-			case CENTER_VALUE: return CENTER;
-			case RIGHT_VALUE: return RIGHT;
-			case JUSTIFY_VALUE: return JUSTIFY;
-			case CHAR_VALUE: return CHAR;
+		case LEFT_VALUE:
+			return LEFT;
+		case CENTER_VALUE:
+			return CENTER;
+		case RIGHT_VALUE:
+			return RIGHT;
+		case JUSTIFY_VALUE:
+			return JUSTIFY;
+		case CHAR_VALUE:
+			return CHAR;
 		}
 		return null;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private AlignType(int value, String name, String literal) {
@@ -258,41 +246,41 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
-} //AlignType
+
+} // AlignType
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/DeclareType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/DeclareType.java
index dffe158..8d431d1 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/DeclareType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/DeclareType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,33 +18,31 @@
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Declare Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Declare Type</b></em>', and
+ * utility methods for working with them. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getDeclareType()
  * @model extendedMetaData="name='declare_._type'"
  * @generated
  */
 public enum DeclareType implements Enumerator {
 	/**
-	 * The '<em><b>Declare</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Declare</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #DECLARE_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	DECLARE(0, "declare", "declare");
+	DECLARE(0, "declare", "declare"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Declare</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Declare</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Declare</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Declare</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #DECLARE
 	 * @model name="declare"
 	 * @generated
@@ -53,33 +51,28 @@
 	public static final int DECLARE_VALUE = 0;
 
 	/**
-	 * An array of all the '<em><b>Declare Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * An array of all the '<em><b>Declare Type</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final DeclareType[] VALUES_ARRAY =
-		new DeclareType[] {
-			DECLARE,
-		};
+	private static final DeclareType[] VALUES_ARRAY = new DeclareType[] { DECLARE, };
 
 	/**
-	 * A public read-only list of all the '<em><b>Declare Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A public read-only list of all the '<em><b>Declare Type</b></em>' enumerators. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<DeclareType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Declare Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Declare Type</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static DeclareType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			DeclareType result = VALUES_ARRAY[i];
+		for (DeclareType result : VALUES_ARRAY) {
 			if (result.toString().equals(literal)) {
 				return result;
 			}
@@ -88,14 +81,13 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Declare Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Declare Type</b></em>' literal with the specified name. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static DeclareType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			DeclareType result = VALUES_ARRAY[i];
+		for (DeclareType result : VALUES_ARRAY) {
 			if (result.getName().equals(name)) {
 				return result;
 			}
@@ -104,43 +96,43 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Declare Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Declare Type</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static DeclareType get(int value) {
 		switch (value) {
-			case DECLARE_VALUE: return DECLARE;
+		case DECLARE_VALUE:
+			return DECLARE;
 		}
 		return null;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private DeclareType(int value, String name, String literal) {
@@ -150,41 +142,41 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
-} //DeclareType
+
+} // DeclareType
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/DocumentRoot.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/DocumentRoot.java
index 69314af..81184e9 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/DocumentRoot.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/DocumentRoot.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,44 +12,39 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EMap;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Document Root</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Document Root</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getDocumentRoot()
  * @model extendedMetaData="name='' kind='mixed'"
  * @generated
  */
 public interface DocumentRoot extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getDocumentRoot_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -59,49 +54,49 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>XMLNS Prefix Map</b></em>' map. The key is of type {@link java.lang.String}, and
+	 * the value is of type {@link java.lang.String}, <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>XMLNS Prefix Map</em>' map isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>XMLNS Prefix Map</em>' map isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>XMLNS Prefix Map</em>' map.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getDocumentRoot_XMLNSPrefixMap()
-	 * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>" transient="true"
-	 *        extendedMetaData="kind='attribute' name='xmlns:prefix'"
+	 * @model mapType=
+	 *        "org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"
+	 *        transient="true" extendedMetaData="kind='attribute' name='xmlns:prefix'"
 	 * @generated
 	 */
 	EMap<String, String> getXMLNSPrefixMap();
 
 	/**
-	 * Returns the value of the '<em><b>XSI Schema Location</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>XSI Schema Location</b></em>' map. The key is of type {@link java.lang.String},
+	 * and the value is of type {@link java.lang.String}, <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>XSI Schema Location</em>' map isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>XSI Schema Location</em>' map isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>XSI Schema Location</em>' map.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getDocumentRoot_XSISchemaLocation()
-	 * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>" transient="true"
-	 *        extendedMetaData="kind='attribute' name='xsi:schemaLocation'"
+	 * @model mapType=
+	 *        "org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"
+	 *        transient="true" extendedMetaData="kind='attribute' name='xsi:schemaLocation'"
 	 * @generated
 	 */
 	EMap<String, String> getXSISchemaLocation();
 
 	/**
-	 * Returns the value of the '<em><b>Div</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Div</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Div</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Div</em>' containment reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Div</em>' containment reference.
 	 * @see #setDiv(XhtmlDivType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getDocumentRoot_Div()
@@ -112,23 +107,24 @@
 	XhtmlDivType getDiv();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getDiv <em>Div</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Div</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getDiv <em>Div</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Div</em>' containment reference.
 	 * @see #getDiv()
 	 * @generated
 	 */
 	void setDiv(XhtmlDivType value);
 
 	/**
-	 * Returns the value of the '<em><b>P</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>P</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>P</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>P</em>' containment reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>P</em>' containment reference.
 	 * @see #setP(XhtmlPType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getDocumentRoot_P()
@@ -140,22 +136,23 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getP <em>P</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>P</em>' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>P</em>' containment reference.
 	 * @see #getP()
 	 * @generated
 	 */
 	void setP(XhtmlPType value);
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getDocumentRoot_Class()
@@ -167,22 +164,22 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getDocumentRoot_Id()
@@ -193,23 +190,24 @@
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getDocumentRoot_Title()
@@ -221,9 +219,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/FrameType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/FrameType.java
index 4081070..0070020 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/FrameType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/FrameType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,113 +18,103 @@
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Frame Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Frame Type</b></em>', and utility
+ * methods for working with them. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getFrameType()
  * @model extendedMetaData="name='frame_._type'"
  * @generated
  */
 public enum FrameType implements Enumerator {
 	/**
-	 * The '<em><b>Void</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Void</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #VOID_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	VOID(0, "void", "void"),
+	VOID(0, "void", "void"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Above</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Above</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #ABOVE_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	ABOVE(1, "above", "above"),
+	ABOVE(1, "above", "above"), //$NON-NLS-1$//$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Below</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Below</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #BELOW_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	BELOW(2, "below", "below"),
+	BELOW(2, "below", "below"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Hsides</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Hsides</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #HSIDES_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	HSIDES(3, "hsides", "hsides"),
+	HSIDES(3, "hsides", "hsides"), //$NON-NLS-1$//$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Lhs</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Lhs</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #LHS_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	LHS(4, "lhs", "lhs"),
+	LHS(4, "lhs", "lhs"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Rhs</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Rhs</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #RHS_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	RHS(5, "rhs", "rhs"),
+	RHS(5, "rhs", "rhs"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Vsides</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Vsides</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #VSIDES_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	VSIDES(6, "vsides", "vsides"),
+	VSIDES(6, "vsides", "vsides"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Box</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Box</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #BOX_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	BOX(7, "box", "box"),
+	BOX(7, "box", "box"), //$NON-NLS-1$//$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Border</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Border</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #BORDER_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	BORDER(8, "border", "border");
+	BORDER(8, "border", "border"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Void</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Void</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Void</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Void</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #VOID
 	 * @model name="void"
 	 * @generated
@@ -133,13 +123,13 @@
 	public static final int VOID_VALUE = 0;
 
 	/**
-	 * The '<em><b>Above</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Above</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Above</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Above</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ABOVE
 	 * @model name="above"
 	 * @generated
@@ -148,13 +138,13 @@
 	public static final int ABOVE_VALUE = 1;
 
 	/**
-	 * The '<em><b>Below</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Below</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Below</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Below</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #BELOW
 	 * @model name="below"
 	 * @generated
@@ -163,13 +153,13 @@
 	public static final int BELOW_VALUE = 2;
 
 	/**
-	 * The '<em><b>Hsides</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Hsides</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Hsides</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Hsides</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #HSIDES
 	 * @model name="hsides"
 	 * @generated
@@ -178,13 +168,13 @@
 	public static final int HSIDES_VALUE = 3;
 
 	/**
-	 * The '<em><b>Lhs</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Lhs</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Lhs</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Lhs</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #LHS
 	 * @model name="lhs"
 	 * @generated
@@ -193,13 +183,13 @@
 	public static final int LHS_VALUE = 4;
 
 	/**
-	 * The '<em><b>Rhs</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Rhs</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Rhs</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Rhs</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #RHS
 	 * @model name="rhs"
 	 * @generated
@@ -208,13 +198,13 @@
 	public static final int RHS_VALUE = 5;
 
 	/**
-	 * The '<em><b>Vsides</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Vsides</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Vsides</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Vsides</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #VSIDES
 	 * @model name="vsides"
 	 * @generated
@@ -223,13 +213,13 @@
 	public static final int VSIDES_VALUE = 6;
 
 	/**
-	 * The '<em><b>Box</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Box</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Box</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Box</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #BOX
 	 * @model name="box"
 	 * @generated
@@ -238,13 +228,13 @@
 	public static final int BOX_VALUE = 7;
 
 	/**
-	 * The '<em><b>Border</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Border</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Border</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Border</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #BORDER
 	 * @model name="border"
 	 * @generated
@@ -253,41 +243,28 @@
 	public static final int BORDER_VALUE = 8;
 
 	/**
-	 * An array of all the '<em><b>Frame Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * An array of all the '<em><b>Frame Type</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final FrameType[] VALUES_ARRAY =
-		new FrameType[] {
-			VOID,
-			ABOVE,
-			BELOW,
-			HSIDES,
-			LHS,
-			RHS,
-			VSIDES,
-			BOX,
-			BORDER,
-		};
+	private static final FrameType[] VALUES_ARRAY = new FrameType[] { VOID, ABOVE, BELOW, HSIDES, LHS, RHS, VSIDES, BOX, BORDER, };
 
 	/**
-	 * A public read-only list of all the '<em><b>Frame Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A public read-only list of all the '<em><b>Frame Type</b></em>' enumerators. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<FrameType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Frame Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Frame Type</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static FrameType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			FrameType result = VALUES_ARRAY[i];
+		for (FrameType result : VALUES_ARRAY) {
 			if (result.toString().equals(literal)) {
 				return result;
 			}
@@ -296,14 +273,13 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Frame Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Frame Type</b></em>' literal with the specified name. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static FrameType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			FrameType result = VALUES_ARRAY[i];
+		for (FrameType result : VALUES_ARRAY) {
 			if (result.getName().equals(name)) {
 				return result;
 			}
@@ -312,51 +288,59 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Frame Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Frame Type</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static FrameType get(int value) {
 		switch (value) {
-			case VOID_VALUE: return VOID;
-			case ABOVE_VALUE: return ABOVE;
-			case BELOW_VALUE: return BELOW;
-			case HSIDES_VALUE: return HSIDES;
-			case LHS_VALUE: return LHS;
-			case RHS_VALUE: return RHS;
-			case VSIDES_VALUE: return VSIDES;
-			case BOX_VALUE: return BOX;
-			case BORDER_VALUE: return BORDER;
+		case VOID_VALUE:
+			return VOID;
+		case ABOVE_VALUE:
+			return ABOVE;
+		case BELOW_VALUE:
+			return BELOW;
+		case HSIDES_VALUE:
+			return HSIDES;
+		case LHS_VALUE:
+			return LHS;
+		case RHS_VALUE:
+			return RHS;
+		case VSIDES_VALUE:
+			return VSIDES;
+		case BOX_VALUE:
+			return BOX;
+		case BORDER_VALUE:
+			return BORDER;
 		}
 		return null;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private FrameType(int value, String name, String literal) {
@@ -366,41 +350,41 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
-} //FrameType
+
+} // FrameType
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/RulesType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/RulesType.java
index 9f25592..024c886 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/RulesType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/RulesType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,73 +18,67 @@
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Rules Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Rules Type</b></em>', and utility
+ * methods for working with them. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getRulesType()
  * @model extendedMetaData="name='rules_._type'"
  * @generated
  */
 public enum RulesType implements Enumerator {
 	/**
-	 * The '<em><b>None</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>None</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #NONE_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	NONE(0, "none", "none"),
+	NONE(0, "none", "none"), //$NON-NLS-1$//$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Groups</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Groups</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #GROUPS_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	GROUPS(1, "groups", "groups"),
+	GROUPS(1, "groups", "groups"), //$NON-NLS-1$//$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Rows</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Rows</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #ROWS_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	ROWS(2, "rows", "rows"),
+	ROWS(2, "rows", "rows"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Cols</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Cols</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #COLS_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	COLS(3, "cols", "cols"),
+	COLS(3, "cols", "cols"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>All</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>All</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #ALL_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	ALL(4, "all", "all");
+	ALL(4, "all", "all"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>None</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>None</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>None</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>None</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #NONE
 	 * @model name="none"
 	 * @generated
@@ -93,13 +87,13 @@
 	public static final int NONE_VALUE = 0;
 
 	/**
-	 * The '<em><b>Groups</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Groups</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Groups</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Groups</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #GROUPS
 	 * @model name="groups"
 	 * @generated
@@ -108,13 +102,13 @@
 	public static final int GROUPS_VALUE = 1;
 
 	/**
-	 * The '<em><b>Rows</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Rows</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Rows</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Rows</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ROWS
 	 * @model name="rows"
 	 * @generated
@@ -123,13 +117,13 @@
 	public static final int ROWS_VALUE = 2;
 
 	/**
-	 * The '<em><b>Cols</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Cols</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Cols</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Cols</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #COLS
 	 * @model name="cols"
 	 * @generated
@@ -138,13 +132,13 @@
 	public static final int COLS_VALUE = 3;
 
 	/**
-	 * The '<em><b>All</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>All</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>All</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>All</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ALL
 	 * @model name="all"
 	 * @generated
@@ -153,37 +147,28 @@
 	public static final int ALL_VALUE = 4;
 
 	/**
-	 * An array of all the '<em><b>Rules Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * An array of all the '<em><b>Rules Type</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final RulesType[] VALUES_ARRAY =
-		new RulesType[] {
-			NONE,
-			GROUPS,
-			ROWS,
-			COLS,
-			ALL,
-		};
+	private static final RulesType[] VALUES_ARRAY = new RulesType[] { NONE, GROUPS, ROWS, COLS, ALL, };
 
 	/**
-	 * A public read-only list of all the '<em><b>Rules Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A public read-only list of all the '<em><b>Rules Type</b></em>' enumerators. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<RulesType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Rules Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Rules Type</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static RulesType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			RulesType result = VALUES_ARRAY[i];
+		for (RulesType result : VALUES_ARRAY) {
 			if (result.toString().equals(literal)) {
 				return result;
 			}
@@ -192,14 +177,13 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Rules Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Rules Type</b></em>' literal with the specified name. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static RulesType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			RulesType result = VALUES_ARRAY[i];
+		for (RulesType result : VALUES_ARRAY) {
 			if (result.getName().equals(name)) {
 				return result;
 			}
@@ -208,47 +192,51 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Rules Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Rules Type</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static RulesType get(int value) {
 		switch (value) {
-			case NONE_VALUE: return NONE;
-			case GROUPS_VALUE: return GROUPS;
-			case ROWS_VALUE: return ROWS;
-			case COLS_VALUE: return COLS;
-			case ALL_VALUE: return ALL;
+		case NONE_VALUE:
+			return NONE;
+		case GROUPS_VALUE:
+			return GROUPS;
+		case ROWS_VALUE:
+			return ROWS;
+		case COLS_VALUE:
+			return COLS;
+		case ALL_VALUE:
+			return ALL;
 		}
 		return null;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private RulesType(int value, String name, String literal) {
@@ -258,41 +246,41 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
-} //RulesType
+
+} // RulesType
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/ScopeType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/ScopeType.java
index ed55383..ac968ae 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/ScopeType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/ScopeType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,63 +18,58 @@
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Scope Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Scope Type</b></em>', and utility
+ * methods for working with them. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getScopeType()
  * @model extendedMetaData="name='scope_._type'"
  * @generated
  */
 public enum ScopeType implements Enumerator {
 	/**
-	 * The '<em><b>Row</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Row</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #ROW_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	ROW(0, "row", "row"),
+	ROW(0, "row", "row"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Col</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Col</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #COL_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	COL(1, "col", "col"),
+	COL(1, "col", "col"), //$NON-NLS-1$//$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Rowgroup</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Rowgroup</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #ROWGROUP_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	ROWGROUP(2, "rowgroup", "rowgroup"),
+	ROWGROUP(2, "rowgroup", "rowgroup"), //$NON-NLS-1$//$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Colgroup</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Colgroup</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #COLGROUP_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	COLGROUP(3, "colgroup", "colgroup");
+	COLGROUP(3, "colgroup", "colgroup"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Row</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Row</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Row</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Row</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ROW
 	 * @model name="row"
 	 * @generated
@@ -83,13 +78,13 @@
 	public static final int ROW_VALUE = 0;
 
 	/**
-	 * The '<em><b>Col</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Col</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Col</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Col</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #COL
 	 * @model name="col"
 	 * @generated
@@ -98,13 +93,13 @@
 	public static final int COL_VALUE = 1;
 
 	/**
-	 * The '<em><b>Rowgroup</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Rowgroup</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Rowgroup</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Rowgroup</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ROWGROUP
 	 * @model name="rowgroup"
 	 * @generated
@@ -113,13 +108,13 @@
 	public static final int ROWGROUP_VALUE = 2;
 
 	/**
-	 * The '<em><b>Colgroup</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Colgroup</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Colgroup</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Colgroup</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #COLGROUP
 	 * @model name="colgroup"
 	 * @generated
@@ -128,36 +123,28 @@
 	public static final int COLGROUP_VALUE = 3;
 
 	/**
-	 * An array of all the '<em><b>Scope Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * An array of all the '<em><b>Scope Type</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final ScopeType[] VALUES_ARRAY =
-		new ScopeType[] {
-			ROW,
-			COL,
-			ROWGROUP,
-			COLGROUP,
-		};
+	private static final ScopeType[] VALUES_ARRAY = new ScopeType[] { ROW, COL, ROWGROUP, COLGROUP, };
 
 	/**
-	 * A public read-only list of all the '<em><b>Scope Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A public read-only list of all the '<em><b>Scope Type</b></em>' enumerators. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<ScopeType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Scope Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Scope Type</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ScopeType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ScopeType result = VALUES_ARRAY[i];
+		for (ScopeType result : VALUES_ARRAY) {
 			if (result.toString().equals(literal)) {
 				return result;
 			}
@@ -166,14 +153,13 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Scope Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Scope Type</b></em>' literal with the specified name. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ScopeType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ScopeType result = VALUES_ARRAY[i];
+		for (ScopeType result : VALUES_ARRAY) {
 			if (result.getName().equals(name)) {
 				return result;
 			}
@@ -182,46 +168,49 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Scope Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Scope Type</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ScopeType get(int value) {
 		switch (value) {
-			case ROW_VALUE: return ROW;
-			case COL_VALUE: return COL;
-			case ROWGROUP_VALUE: return ROWGROUP;
-			case COLGROUP_VALUE: return COLGROUP;
+		case ROW_VALUE:
+			return ROW;
+		case COL_VALUE:
+			return COL;
+		case ROWGROUP_VALUE:
+			return ROWGROUP;
+		case COLGROUP_VALUE:
+			return COLGROUP;
 		}
 		return null;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private ScopeType(int value, String name, String literal) {
@@ -231,41 +220,41 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
-} //ScopeType
+
+} // ScopeType
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/ValignType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/ValignType.java
index 4716d7e..9eac296 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/ValignType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/ValignType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,63 +18,58 @@
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Valign Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Valign Type</b></em>', and
+ * utility methods for working with them. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getValignType()
  * @model extendedMetaData="name='valign_._type'"
  * @generated
  */
 public enum ValignType implements Enumerator {
 	/**
-	 * The '<em><b>Top</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Top</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #TOP_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	TOP(0, "top", "top"),
+	TOP(0, "top", "top"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Middle</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Middle</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #MIDDLE_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	MIDDLE(1, "middle", "middle"),
+	MIDDLE(1, "middle", "middle"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Bottom</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Bottom</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #BOTTOM_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	BOTTOM(2, "bottom", "bottom"),
+	BOTTOM(2, "bottom", "bottom"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Baseline</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Baseline</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #BASELINE_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	BASELINE(3, "baseline", "baseline");
+	BASELINE(3, "baseline", "baseline"); //$NON-NLS-1$//$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Top</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Top</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Top</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Top</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #TOP
 	 * @model name="top"
 	 * @generated
@@ -83,13 +78,13 @@
 	public static final int TOP_VALUE = 0;
 
 	/**
-	 * The '<em><b>Middle</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Middle</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Middle</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Middle</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #MIDDLE
 	 * @model name="middle"
 	 * @generated
@@ -98,13 +93,13 @@
 	public static final int MIDDLE_VALUE = 1;
 
 	/**
-	 * The '<em><b>Bottom</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Bottom</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Bottom</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Bottom</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #BOTTOM
 	 * @model name="bottom"
 	 * @generated
@@ -113,13 +108,13 @@
 	public static final int BOTTOM_VALUE = 2;
 
 	/**
-	 * The '<em><b>Baseline</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Baseline</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Baseline</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Baseline</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #BASELINE
 	 * @model name="baseline"
 	 * @generated
@@ -128,36 +123,28 @@
 	public static final int BASELINE_VALUE = 3;
 
 	/**
-	 * An array of all the '<em><b>Valign Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * An array of all the '<em><b>Valign Type</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final ValignType[] VALUES_ARRAY =
-		new ValignType[] {
-			TOP,
-			MIDDLE,
-			BOTTOM,
-			BASELINE,
-		};
+	private static final ValignType[] VALUES_ARRAY = new ValignType[] { TOP, MIDDLE, BOTTOM, BASELINE, };
 
 	/**
-	 * A public read-only list of all the '<em><b>Valign Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A public read-only list of all the '<em><b>Valign Type</b></em>' enumerators. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<ValignType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Valign Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Valign Type</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ValignType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ValignType result = VALUES_ARRAY[i];
+		for (ValignType result : VALUES_ARRAY) {
 			if (result.toString().equals(literal)) {
 				return result;
 			}
@@ -166,14 +153,13 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Valign Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Valign Type</b></em>' literal with the specified name. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ValignType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ValignType result = VALUES_ARRAY[i];
+		for (ValignType result : VALUES_ARRAY) {
 			if (result.getName().equals(name)) {
 				return result;
 			}
@@ -182,46 +168,49 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Valign Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Valign Type</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ValignType get(int value) {
 		switch (value) {
-			case TOP_VALUE: return TOP;
-			case MIDDLE_VALUE: return MIDDLE;
-			case BOTTOM_VALUE: return BOTTOM;
-			case BASELINE_VALUE: return BASELINE;
+		case TOP_VALUE:
+			return TOP;
+		case MIDDLE_VALUE:
+			return MIDDLE;
+		case BOTTOM_VALUE:
+			return BOTTOM;
+		case BASELINE_VALUE:
+			return BASELINE;
 		}
 		return null;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private ValignType(int value, String name, String literal) {
@@ -231,41 +220,41 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
-} //ValignType
+
+} // ValignType
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/ValuetypeType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/ValuetypeType.java
index 48033ee..c055532 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/ValuetypeType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/ValuetypeType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,53 +18,49 @@
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Valuetype Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Valuetype Type</b></em>', and
+ * utility methods for working with them. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getValuetypeType()
  * @model extendedMetaData="name='valuetype_._type'"
  * @generated
  */
 public enum ValuetypeType implements Enumerator {
 	/**
-	 * The '<em><b>Data</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Data</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #DATA_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	DATA(0, "data", "data"),
+	DATA(0, "data", "data"), //$NON-NLS-1$//$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Ref</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Ref</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #REF_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	REF(1, "ref", "ref"),
+	REF(1, "ref", "ref"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Object</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Object</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #OBJECT_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	OBJECT(2, "object", "object");
+	OBJECT(2, "object", "object"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Data</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Data</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Data</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Data</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #DATA
 	 * @model name="data"
 	 * @generated
@@ -73,13 +69,13 @@
 	public static final int DATA_VALUE = 0;
 
 	/**
-	 * The '<em><b>Ref</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Ref</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Ref</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Ref</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #REF
 	 * @model name="ref"
 	 * @generated
@@ -88,13 +84,13 @@
 	public static final int REF_VALUE = 1;
 
 	/**
-	 * The '<em><b>Object</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Object</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Object</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Object</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OBJECT
 	 * @model name="object"
 	 * @generated
@@ -103,35 +99,28 @@
 	public static final int OBJECT_VALUE = 2;
 
 	/**
-	 * An array of all the '<em><b>Valuetype Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * An array of all the '<em><b>Valuetype Type</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final ValuetypeType[] VALUES_ARRAY =
-		new ValuetypeType[] {
-			DATA,
-			REF,
-			OBJECT,
-		};
+	private static final ValuetypeType[] VALUES_ARRAY = new ValuetypeType[] { DATA, REF, OBJECT, };
 
 	/**
-	 * A public read-only list of all the '<em><b>Valuetype Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A public read-only list of all the '<em><b>Valuetype Type</b></em>' enumerators. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<ValuetypeType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Valuetype Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
+	 * Returns the '<em><b>Valuetype Type</b></em>' literal with the specified literal value. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ValuetypeType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ValuetypeType result = VALUES_ARRAY[i];
+		for (ValuetypeType result : VALUES_ARRAY) {
 			if (result.toString().equals(literal)) {
 				return result;
 			}
@@ -140,14 +129,13 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Valuetype Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Valuetype Type</b></em>' literal with the specified name. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ValuetypeType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ValuetypeType result = VALUES_ARRAY[i];
+		for (ValuetypeType result : VALUES_ARRAY) {
 			if (result.getName().equals(name)) {
 				return result;
 			}
@@ -156,45 +144,47 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Valuetype Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
+	 * Returns the '<em><b>Valuetype Type</b></em>' literal with the specified integer value. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ValuetypeType get(int value) {
 		switch (value) {
-			case DATA_VALUE: return DATA;
-			case REF_VALUE: return REF;
-			case OBJECT_VALUE: return OBJECT;
+		case DATA_VALUE:
+			return DATA;
+		case REF_VALUE:
+			return REF;
+		case OBJECT_VALUE:
+			return OBJECT;
 		}
 		return null;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private ValuetypeType(int value, String name, String literal) {
@@ -204,41 +194,41 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
-} //ValuetypeType
+
+} // ValuetypeType
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlAType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlAType.java
index feb7274..7ad2496 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlAType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlAType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,81 +12,74 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import java.math.BigInteger;
-
 import java.util.List;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>AType</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>AType</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getXhtmlInlNoAnchorMix <em>Xhtml Inl No Anchor Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAccesskey <em>Accesskey</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getCharset <em>Charset</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getHref <em>Href</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getHreflang <em>Hreflang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getRel <em>Rel</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getRev <em>Rev</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTabindex <em>Tabindex</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getXhtmlInlNoAnchorMix <em>Xhtml Inl No Anchor Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAccesskey <em>Accesskey</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getCharset <em>Charset</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getHref <em>Href</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getHreflang <em>Hreflang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getRel <em>Rel</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getRev <em>Rev</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTabindex <em>Tabindex</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType()
  * @model extendedMetaData="name='a' kind='mixed'"
  * @generated
  */
 public interface XhtmlAType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -96,31 +89,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inl No Anchor Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inl No Anchor Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inl No Anchor Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inl No Anchor Mix</em>' attribute list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inl No Anchor Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_XhtmlInlNoAnchorMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlNoAnchorMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlNoAnchorMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlNoAnchorMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -130,14 +123,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -147,14 +140,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -164,14 +157,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -181,14 +174,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -198,14 +191,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -215,14 +208,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -232,14 +225,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -249,14 +242,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -266,14 +259,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -283,14 +276,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -300,14 +293,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -317,14 +310,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -334,14 +327,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -351,14 +344,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -368,14 +361,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -385,14 +378,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -402,14 +395,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -419,14 +412,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -436,14 +429,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -453,14 +446,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -470,14 +463,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -487,14 +480,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -504,13 +497,13 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Accesskey</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Accesskey</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Accesskey</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Accesskey</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Accesskey</em>' attribute.
 	 * @see #setAccesskey(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Accesskey()
@@ -521,104 +514,104 @@
 	String getAccesskey();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAccesskey <em>Accesskey</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Accesskey</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAccesskey <em>Accesskey</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Accesskey</em>' attribute.
 	 * @see #getAccesskey()
 	 * @generated
 	 */
 	void setAccesskey(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Charset</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Charset</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Charset</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Charset</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Charset</em>' attribute.
 	 * @see #setCharset(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Charset()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Charset"
-	 *        extendedMetaData="kind='attribute' name='charset'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Charset" extendedMetaData="kind='attribute' name='charset'"
 	 * @generated
 	 */
 	String getCharset();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getCharset <em>Charset</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Charset</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Charset</em>' attribute.
 	 * @see #getCharset()
 	 * @generated
 	 */
 	void setCharset(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getClass_ <em>Class</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Href</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Href</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Href</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Href</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Href</em>' attribute.
 	 * @see #setHref(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Href()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.URI"
-	 *        extendedMetaData="kind='attribute' name='href'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.URI" extendedMetaData="kind='attribute' name='href'"
 	 * @generated
 	 */
 	String getHref();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getHref <em>Href</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Href</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getHref <em>Href</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Href</em>' attribute.
 	 * @see #getHref()
 	 * @generated
 	 */
 	void setHref(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Hreflang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hreflang</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hreflang</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hreflang</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hreflang</em>' attribute.
 	 * @see #setHreflang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Hreflang()
@@ -630,79 +623,64 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getHreflang <em>Hreflang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hreflang</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Hreflang</em>' attribute.
 	 * @see #getHreflang()
 	 * @generated
 	 */
 	void setHreflang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Lang()
@@ -713,23 +691,23 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Rel</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Rel</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Rel</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Rel</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Rel</em>' attribute.
 	 * @see #setRel(List)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Rel()
@@ -740,23 +718,23 @@
 	List<String> getRel();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getRel <em>Rel</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rel</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getRel <em>Rel</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Rel</em>' attribute.
 	 * @see #getRel()
 	 * @generated
 	 */
 	void setRel(List<String> value);
 
 	/**
-	 * Returns the value of the '<em><b>Rev</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Rev</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Rev</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Rev</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Rev</em>' attribute.
 	 * @see #setRev(List)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Rev()
@@ -767,36 +745,28 @@
 	List<String> getRev();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getRev <em>Rev</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rev</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getRev <em>Rev</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Rev</em>' attribute.
 	 * @see #getRev()
 	 * @generated
 	 */
 	void setRev(List<String> value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -810,10 +780,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -824,8 +795,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -834,9 +805,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -846,108 +817,107 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Tabindex</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tabindex</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tabindex</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tabindex</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tabindex</em>' attribute.
 	 * @see #setTabindex(BigInteger)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Tabindex()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Number"
-	 *        extendedMetaData="kind='attribute' name='tabindex'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Number" extendedMetaData="kind='attribute' name='tabindex'"
 	 * @generated
 	 */
 	BigInteger getTabindex();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTabindex <em>Tabindex</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Tabindex</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Tabindex</em>' attribute.
 	 * @see #getTabindex()
 	 * @generated
 	 */
 	void setTabindex(BigInteger value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
 	void setTitle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' attribute.
 	 * @see #setType(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAType_Type()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.ContentType"
-	 *        extendedMetaData="kind='attribute' name='type'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.ContentType" extendedMetaData="kind='attribute' name='type'"
 	 * @generated
 	 */
 	String getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getType <em>Type</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Type</em>' attribute.
 	 * @see #getType()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlAbbrType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlAbbrType.java
index 4082bfe..bff3acb 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlAbbrType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlAbbrType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abbr Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Abbr Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType()
  * @model extendedMetaData="name='abbr' kind='mixed'"
  * @generated
  */
 public interface XhtmlAbbrType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -655,9 +625,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAbbrType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlAcronymType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlAcronymType.java
index 6b3b5ec..f7b465e 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlAcronymType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlAcronymType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Acronym Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Acronym Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType()
  * @model extendedMetaData="name='acronym' kind='mixed'"
  * @generated
  */
 public interface XhtmlAcronymType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getClass_ <em>Class</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Lang()
@@ -612,35 +590,27 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -655,9 +625,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -667,9 +638,9 @@
 	void setSpace(SpaceType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSpace <em>Space</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAcronymType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlAddressType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlAddressType.java
index 46b82d0..25de836 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlAddressType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlAddressType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Address Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Address Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType()
  * @model extendedMetaData="name='address' kind='mixed'"
  * @generated
  */
 public interface XhtmlAddressType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getClass_ <em>Class</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Lang()
@@ -612,35 +590,27 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -655,9 +625,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -667,9 +638,9 @@
 	void setSpace(SpaceType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSpace <em>Space</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlAddressType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlBlockquoteType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlBlockquoteType.java
index e6208b7..991ead3 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlBlockquoteType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlBlockquoteType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,64 +12,58 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Blockquote Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Blockquote Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getXhtmlBlockMix <em>Xhtml Block Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH1 <em>H1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH2 <em>H2</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH3 <em>H3</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH4 <em>H4</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH5 <em>H5</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH6 <em>H6</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getUl <em>Ul</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getOl <em>Ol</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getDl <em>Dl</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getPre <em>Pre</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getBlockquote <em>Blockquote</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getHr <em>Hr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getXhtmlBlockMix <em>Xhtml Block Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH1 <em>H1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH2 <em>H2</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH3 <em>H3</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH4 <em>H4</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH5 <em>H5</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH6 <em>H6</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getUl <em>Ul</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getOl <em>Ol</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getDl <em>Dl</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getPre <em>Pre</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getBlockquote <em>Blockquote</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getAddress <em>Address</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getHr <em>Hr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType()
  * @model extendedMetaData="name='blockquote' kind='elementOnly'"
  * @generated
  */
 public interface XhtmlBlockquoteType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Xhtml Block Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Block Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Block Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Block Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Block Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_XhtmlBlockMix()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -79,14 +73,14 @@
 	FeatureMap getXhtmlBlockMix();
 
 	/**
-	 * Returns the value of the '<em><b>H1</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H1</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H1</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H1</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H1</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_H1()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -96,14 +90,14 @@
 	EList<XhtmlH1Type> getH1();
 
 	/**
-	 * Returns the value of the '<em><b>H2</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H2</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H2</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H2</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H2</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_H2()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -113,14 +107,14 @@
 	EList<XhtmlH2Type> getH2();
 
 	/**
-	 * Returns the value of the '<em><b>H3</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H3</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H3</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H3</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H3</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_H3()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -130,14 +124,14 @@
 	EList<XhtmlH3Type> getH3();
 
 	/**
-	 * Returns the value of the '<em><b>H4</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H4</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H4</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H4</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H4</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_H4()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -147,14 +141,14 @@
 	EList<XhtmlH4Type> getH4();
 
 	/**
-	 * Returns the value of the '<em><b>H5</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H5</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H5</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H5</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H5</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_H5()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -164,14 +158,14 @@
 	EList<XhtmlH5Type> getH5();
 
 	/**
-	 * Returns the value of the '<em><b>H6</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H6</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H6</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H6</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H6</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_H6()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -181,14 +175,14 @@
 	EList<XhtmlH6Type> getH6();
 
 	/**
-	 * Returns the value of the '<em><b>Ul</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ul</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ul</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ul</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ul</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Ul()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -198,14 +192,14 @@
 	EList<XhtmlUlType> getUl();
 
 	/**
-	 * Returns the value of the '<em><b>Ol</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ol</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ol</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ol</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ol</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Ol()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -215,14 +209,14 @@
 	EList<XhtmlOlType> getOl();
 
 	/**
-	 * Returns the value of the '<em><b>Dl</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dl</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dl</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dl</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dl</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Dl()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -232,14 +226,14 @@
 	EList<XhtmlDlType> getDl();
 
 	/**
-	 * Returns the value of the '<em><b>P</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>P</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>P</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>P</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>P</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_P()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -249,14 +243,14 @@
 	EList<XhtmlPType> getP();
 
 	/**
-	 * Returns the value of the '<em><b>Div</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Div</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Div</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Div</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Div</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Div()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -266,14 +260,14 @@
 	EList<XhtmlDivType> getDiv();
 
 	/**
-	 * Returns the value of the '<em><b>Pre</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Pre</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Pre</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Pre</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Pre</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Pre()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -283,14 +277,14 @@
 	EList<XhtmlPreType> getPre();
 
 	/**
-	 * Returns the value of the '<em><b>Blockquote</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Blockquote</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Blockquote</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Blockquote</em>' containment reference list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Blockquote</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Blockquote()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -300,14 +294,14 @@
 	EList<XhtmlBlockquoteType> getBlockquote();
 
 	/**
-	 * Returns the value of the '<em><b>Address</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Address</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Address</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Address</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Address</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Address()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -317,14 +311,14 @@
 	EList<XhtmlAddressType> getAddress();
 
 	/**
-	 * Returns the value of the '<em><b>Hr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Hr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -334,14 +328,14 @@
 	EList<XhtmlHrType> getHr();
 
 	/**
-	 * Returns the value of the '<em><b>Table</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Table</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Table</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Table()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -351,14 +345,14 @@
 	EList<XhtmlTableType> getTable();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -368,14 +362,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -385,124 +379,107 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' attribute.
 	 * @see #setCite(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Cite()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.URI"
-	 *        extendedMetaData="kind='attribute' name='cite'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.URI" extendedMetaData="kind='attribute' name='cite'"
 	 * @generated
 	 */
 	String getCite();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getCite <em>Cite</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cite</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getCite <em>Cite</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Cite</em>' attribute.
 	 * @see #getCite()
 	 * @generated
 	 */
 	void setCite(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getClass_ <em>Class</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Lang()
@@ -513,36 +490,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getLang <em>Lang</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -556,10 +525,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getSpace <em>Space</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -569,9 +539,9 @@
 	void setSpace(SpaceType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getSpace <em>Space</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -580,9 +550,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getSpace
+	 * <em>Space</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -592,54 +562,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getStyle <em>Style</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBlockquoteType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getTitle <em>Title</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlBrType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlBrType.java
index a356c93..99fb251 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlBrType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlBrType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,104 +12,90 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Br Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Br Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBrType()
  * @model extendedMetaData="name='br' kind='elementOnly'"
  * @generated
  */
 public interface XhtmlBrType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBrType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBrType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -123,10 +109,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -137,8 +124,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -147,9 +134,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -159,27 +146,27 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlBrType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlCaptionType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlCaptionType.java
index 26b7d68..9cdd6c5 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlCaptionType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlCaptionType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Caption Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Caption Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType()
  * @model extendedMetaData="name='caption' kind='mixed'"
  * @generated
  */
 public interface XhtmlCaptionType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getClass_ <em>Class</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Lang()
@@ -612,35 +590,27 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -655,9 +625,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -667,9 +638,9 @@
 	void setSpace(SpaceType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSpace <em>Space</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCaptionType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlCiteType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlCiteType.java
index 9932dd1..28d4198 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlCiteType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlCiteType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Cite Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Cite Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType()
  * @model extendedMetaData="name='cite' kind='mixed'"
  * @generated
  */
 public interface XhtmlCiteType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -655,9 +625,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCiteType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlCodeType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlCodeType.java
index 2a009b3..791f026 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlCodeType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlCodeType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Code Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Code Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType()
  * @model extendedMetaData="name='code' kind='mixed'"
  * @generated
  */
 public interface XhtmlCodeType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -655,9 +625,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlCodeType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlColType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlColType.java
index d500fd3..1b85728 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlColType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlColType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,63 +14,59 @@
 import java.math.BigInteger;
 
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Col Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Col Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getAlign <em>Align</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getChar <em>Char</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getCharoff <em>Charoff</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getValign <em>Valign</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getAlign <em>Align</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getChar <em>Char</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getCharoff <em>Charoff</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getValign <em>Valign</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getWidth <em>Width</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColType()
  * @model extendedMetaData="name='col' kind='elementOnly'"
  * @generated
  */
 public interface XhtmlColType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Align</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.AlignType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Align</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.AlignType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Align</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Align</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Align</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see #isSetAlign()
 	 * @see #unsetAlign()
 	 * @see #setAlign(AlignType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColType_Align()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='align'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='align'"
 	 * @generated
 	 */
 	AlignType getAlign();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getAlign <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Align</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Align</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see #isSetAlign()
 	 * @see #unsetAlign()
@@ -81,8 +77,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getAlign <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetAlign()
 	 * @see #getAlign()
 	 * @see #setAlign(AlignType)
@@ -91,9 +87,9 @@
 	void unsetAlign();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getAlign <em>Align</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getAlign <em>Align</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Align</em>' attribute is set.
 	 * @see #unsetAlign()
 	 * @see #getAlign()
@@ -103,151 +99,134 @@
 	boolean isSetAlign();
 
 	/**
-	 * Returns the value of the '<em><b>Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Char</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Char</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Char</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Char</em>' attribute.
 	 * @see #setChar(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColType_Char()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Character"
-	 *        extendedMetaData="kind='attribute' name='char'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Character" extendedMetaData="kind='attribute' name='char'"
 	 * @generated
 	 */
 	String getChar();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getChar <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Char</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getChar <em>Char</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Char</em>' attribute.
 	 * @see #getChar()
 	 * @generated
 	 */
 	void setChar(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Charoff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Charoff</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Charoff</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Charoff</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Charoff</em>' attribute.
 	 * @see #setCharoff(Object)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColType_Charoff()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length"
-	 *        extendedMetaData="kind='attribute' name='charoff'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length" extendedMetaData="kind='attribute' name='charoff'"
 	 * @generated
 	 */
 	Object getCharoff();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getCharoff <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Charoff</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Charoff</em>' attribute.
 	 * @see #getCharoff()
 	 * @generated
 	 */
 	void setCharoff(Object value);
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColType_Lang()
@@ -258,36 +237,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -302,9 +273,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -315,8 +287,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -325,9 +297,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -337,14 +309,13 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' attribute.
-	 * The default value is <code>"1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' attribute. The default value is <code>"1"</code>. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' attribute.
 	 * @see #isSetSpan()
 	 * @see #unsetSpan()
@@ -357,10 +328,11 @@
 	BigInteger getSpan();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpan <em>Span</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Span</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpan <em>Span</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Span</em>' attribute.
 	 * @see #isSetSpan()
 	 * @see #unsetSpan()
 	 * @see #getSpan()
@@ -370,8 +342,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpan <em>Span</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpan()
 	 * @see #getSpan()
 	 * @see #setSpan(BigInteger)
@@ -380,9 +352,9 @@
 	void unsetSpan();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpan <em>Span</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpan <em>Span</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Span</em>' attribute is set.
 	 * @see #unsetSpan()
 	 * @see #getSpan()
@@ -392,85 +364,85 @@
 	boolean isSetSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
 	void setTitle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Valign</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.ValignType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Valign</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.ValignType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Valign</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Valign</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Valign</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see #isSetValign()
 	 * @see #unsetValign()
 	 * @see #setValign(ValignType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColType_Valign()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='valign'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='valign'"
 	 * @generated
 	 */
 	ValignType getValign();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getValign <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Valign</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Valign</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see #isSetValign()
 	 * @see #unsetValign()
@@ -481,8 +453,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getValign <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetValign()
 	 * @see #getValign()
 	 * @see #setValign(ValignType)
@@ -491,9 +463,9 @@
 	void unsetValign();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getValign <em>Valign</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getValign <em>Valign</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Valign</em>' attribute is set.
 	 * @see #unsetValign()
 	 * @see #getValign()
@@ -503,27 +475,27 @@
 	boolean isSetValign();
 
 	/**
-	 * Returns the value of the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Width</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Width</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Width</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Width</em>' attribute.
 	 * @see #setWidth(Object)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColType_Width()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.MultiLength"
-	 *        extendedMetaData="kind='attribute' name='width'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.MultiLength" extendedMetaData="kind='attribute' name='width'"
 	 * @generated
 	 */
 	Object getWidth();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getWidth <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Width</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Width</em>' attribute.
 	 * @see #getWidth()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlColgroupType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlColgroupType.java
index 907fd75..07f400a 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlColgroupType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlColgroupType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,83 +14,77 @@
 import java.math.BigInteger;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Colgroup Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Colgroup Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getCol <em>Col</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getAlign <em>Align</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getChar <em>Char</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getCharoff <em>Charoff</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getValign <em>Valign</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getCol <em>Col</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getAlign <em>Align</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getChar <em>Char</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getCharoff <em>Charoff</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getValign <em>Valign</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getWidth <em>Width</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColgroupType()
  * @model extendedMetaData="name='colgroup' kind='elementOnly'"
  * @generated
  */
 public interface XhtmlColgroupType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Col</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Col</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Col</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Col</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Col</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColgroupType_Col()
-	 * @model containment="true"
-	 *        extendedMetaData="kind='element' name='col' namespace='##targetNamespace'"
+	 * @model containment="true" extendedMetaData="kind='element' name='col' namespace='##targetNamespace'"
 	 * @generated
 	 */
 	EList<XhtmlColType> getCol();
 
 	/**
-	 * Returns the value of the '<em><b>Align</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.AlignType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Align</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.AlignType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Align</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Align</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Align</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see #isSetAlign()
 	 * @see #unsetAlign()
 	 * @see #setAlign(AlignType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColgroupType_Align()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='align'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='align'"
 	 * @generated
 	 */
 	AlignType getAlign();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getAlign <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Align</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getAlign <em>Align</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Align</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see #isSetAlign()
 	 * @see #unsetAlign()
@@ -100,9 +94,9 @@
 	void setAlign(AlignType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getAlign <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getAlign <em>Align</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetAlign()
 	 * @see #getAlign()
 	 * @see #setAlign(AlignType)
@@ -111,9 +105,9 @@
 	void unsetAlign();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getAlign <em>Align</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getAlign <em>Align</em>}
+	 * ' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Align</em>' attribute is set.
 	 * @see #unsetAlign()
 	 * @see #getAlign()
@@ -123,151 +117,134 @@
 	boolean isSetAlign();
 
 	/**
-	 * Returns the value of the '<em><b>Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Char</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Char</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Char</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Char</em>' attribute.
 	 * @see #setChar(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColgroupType_Char()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Character"
-	 *        extendedMetaData="kind='attribute' name='char'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Character" extendedMetaData="kind='attribute' name='char'"
 	 * @generated
 	 */
 	String getChar();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getChar <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Char</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Char</em>' attribute.
 	 * @see #getChar()
 	 * @generated
 	 */
 	void setChar(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Charoff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Charoff</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Charoff</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Charoff</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Charoff</em>' attribute.
 	 * @see #setCharoff(Object)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColgroupType_Charoff()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length"
-	 *        extendedMetaData="kind='attribute' name='charoff'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length" extendedMetaData="kind='attribute' name='charoff'"
 	 * @generated
 	 */
 	Object getCharoff();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getCharoff <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Charoff</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getCharoff <em>Charoff</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Charoff</em>' attribute.
 	 * @see #getCharoff()
 	 * @generated
 	 */
 	void setCharoff(Object value);
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColgroupType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getClass_ <em>Class</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColgroupType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColgroupType_Lang()
@@ -279,35 +256,27 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -321,10 +290,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpace <em>Space</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -334,9 +304,9 @@
 	void setSpace(SpaceType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpace <em>Space</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -345,9 +315,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpace <em>Space</em>}
+	 * ' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -357,14 +327,13 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' attribute.
-	 * The default value is <code>"1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' attribute. The default value is <code>"1"</code>. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' attribute.
 	 * @see #isSetSpan()
 	 * @see #unsetSpan()
@@ -378,9 +347,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpan <em>Span</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Span</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Span</em>' attribute.
 	 * @see #isSetSpan()
 	 * @see #unsetSpan()
 	 * @see #getSpan()
@@ -389,9 +359,9 @@
 	void setSpan(BigInteger value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpan <em>Span</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpan <em>Span</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpan()
 	 * @see #getSpan()
 	 * @see #setSpan(BigInteger)
@@ -400,9 +370,9 @@
 	void unsetSpan();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpan <em>Span</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpan <em>Span</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Span</em>' attribute is set.
 	 * @see #unsetSpan()
 	 * @see #getSpan()
@@ -412,85 +382,85 @@
 	boolean isSetSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColgroupType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getStyle <em>Style</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColgroupType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getTitle <em>Title</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
 	void setTitle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Valign</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.ValignType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Valign</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.ValignType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Valign</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Valign</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Valign</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see #isSetValign()
 	 * @see #unsetValign()
 	 * @see #setValign(ValignType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColgroupType_Valign()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='valign'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='valign'"
 	 * @generated
 	 */
 	ValignType getValign();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getValign <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Valign</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getValign <em>Valign</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Valign</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see #isSetValign()
 	 * @see #unsetValign()
@@ -500,9 +470,9 @@
 	void setValign(ValignType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getValign <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getValign <em>Valign</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetValign()
 	 * @see #getValign()
 	 * @see #setValign(ValignType)
@@ -511,9 +481,9 @@
 	void unsetValign();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getValign <em>Valign</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getValign
+	 * <em>Valign</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Valign</em>' attribute is set.
 	 * @see #unsetValign()
 	 * @see #getValign()
@@ -523,27 +493,27 @@
 	boolean isSetValign();
 
 	/**
-	 * Returns the value of the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Width</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Width</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Width</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Width</em>' attribute.
 	 * @see #setWidth(Object)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlColgroupType_Width()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.MultiLength"
-	 *        extendedMetaData="kind='attribute' name='width'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.MultiLength" extendedMetaData="kind='attribute' name='width'"
 	 * @generated
 	 */
 	Object getWidth();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getWidth <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Width</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getWidth <em>Width</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Width</em>' attribute.
 	 * @see #getWidth()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDdType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDdType.java
index 9927bad..b5372c5 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDdType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDdType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,86 +12,80 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Dd Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Dd Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH1 <em>H1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH2 <em>H2</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH3 <em>H3</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH4 <em>H4</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH5 <em>H5</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH6 <em>H6</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getUl <em>Ul</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getOl <em>Ol</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDl <em>Dl</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getPre <em>Pre</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getBlockquote <em>Blockquote</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getHr <em>Hr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH1 <em>H1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH2 <em>H2</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH3 <em>H3</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH4 <em>H4</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH5 <em>H5</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH6 <em>H6</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getUl <em>Ul</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getOl <em>Ol</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDl <em>Dl</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getPre <em>Pre</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getBlockquote <em>Blockquote</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getAddress <em>Address</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getHr <em>Hr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType()
  * @model extendedMetaData="name='dd' kind='mixed'"
  * @generated
  */
 public interface XhtmlDdType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -101,31 +95,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Flow Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Flow Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Flow Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Flow Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Flow Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_XhtmlFlowMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlFlowMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlFlowMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlFlowMix();
 
 	/**
-	 * Returns the value of the '<em><b>H1</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H1</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H1</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H1</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H1</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_H1()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -135,14 +129,14 @@
 	EList<XhtmlH1Type> getH1();
 
 	/**
-	 * Returns the value of the '<em><b>H2</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H2</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H2</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H2</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H2</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_H2()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -152,14 +146,14 @@
 	EList<XhtmlH2Type> getH2();
 
 	/**
-	 * Returns the value of the '<em><b>H3</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H3</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H3</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H3</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H3</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_H3()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -169,14 +163,14 @@
 	EList<XhtmlH3Type> getH3();
 
 	/**
-	 * Returns the value of the '<em><b>H4</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H4</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H4</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H4</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H4</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_H4()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -186,14 +180,14 @@
 	EList<XhtmlH4Type> getH4();
 
 	/**
-	 * Returns the value of the '<em><b>H5</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H5</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H5</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H5</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H5</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_H5()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -203,14 +197,14 @@
 	EList<XhtmlH5Type> getH5();
 
 	/**
-	 * Returns the value of the '<em><b>H6</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H6</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H6</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H6</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H6</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_H6()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -220,14 +214,14 @@
 	EList<XhtmlH6Type> getH6();
 
 	/**
-	 * Returns the value of the '<em><b>Ul</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ul</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ul</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ul</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ul</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Ul()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -237,14 +231,14 @@
 	EList<XhtmlUlType> getUl();
 
 	/**
-	 * Returns the value of the '<em><b>Ol</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ol</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ol</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ol</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ol</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Ol()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -254,14 +248,14 @@
 	EList<XhtmlOlType> getOl();
 
 	/**
-	 * Returns the value of the '<em><b>Dl</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dl</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dl</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dl</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dl</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Dl()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -271,14 +265,14 @@
 	EList<XhtmlDlType> getDl();
 
 	/**
-	 * Returns the value of the '<em><b>P</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>P</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>P</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>P</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>P</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_P()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -288,14 +282,14 @@
 	EList<XhtmlPType> getP();
 
 	/**
-	 * Returns the value of the '<em><b>Div</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Div</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Div</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Div</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Div</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Div()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -305,14 +299,14 @@
 	EList<XhtmlDivType> getDiv();
 
 	/**
-	 * Returns the value of the '<em><b>Pre</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Pre</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Pre</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Pre</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Pre</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Pre()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -322,14 +316,14 @@
 	EList<XhtmlPreType> getPre();
 
 	/**
-	 * Returns the value of the '<em><b>Blockquote</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Blockquote</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Blockquote</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Blockquote</em>' containment reference list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Blockquote</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Blockquote()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -339,14 +333,14 @@
 	EList<XhtmlBlockquoteType> getBlockquote();
 
 	/**
-	 * Returns the value of the '<em><b>Address</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Address</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Address</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Address</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Address</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Address()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -356,14 +350,14 @@
 	EList<XhtmlAddressType> getAddress();
 
 	/**
-	 * Returns the value of the '<em><b>Hr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Hr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -373,14 +367,14 @@
 	EList<XhtmlHrType> getHr();
 
 	/**
-	 * Returns the value of the '<em><b>Table</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Table</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Table</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Table()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -390,14 +384,14 @@
 	EList<XhtmlTableType> getTable();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -407,14 +401,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -424,14 +418,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -441,14 +435,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -458,14 +452,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -475,14 +469,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -492,14 +486,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -509,14 +503,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -526,14 +520,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -543,14 +537,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -560,14 +554,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -577,14 +571,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -594,14 +588,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -611,14 +605,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -628,14 +622,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -645,14 +639,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -662,14 +656,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -679,14 +673,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -696,14 +690,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -713,14 +707,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -730,14 +724,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -747,14 +741,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -764,14 +758,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -781,14 +775,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -798,97 +792,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Lang()
@@ -899,36 +877,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -942,10 +912,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -956,8 +927,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -966,9 +937,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -978,54 +949,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDdType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDfnType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDfnType.java
index ddd73e6..6dc9173 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDfnType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDfnType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Dfn Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Dfn Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType()
  * @model extendedMetaData="name='dfn' kind='mixed'"
  * @generated
  */
 public interface XhtmlDfnType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -655,9 +625,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDfnType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDivType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDivType.java
index c448ab2..057a1de 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDivType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDivType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,86 +12,80 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Div Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Div Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH1 <em>H1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH2 <em>H2</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH3 <em>H3</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH4 <em>H4</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH5 <em>H5</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH6 <em>H6</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getUl <em>Ul</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getOl <em>Ol</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDl <em>Dl</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getPre <em>Pre</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getBlockquote <em>Blockquote</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getHr <em>Hr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH1 <em>H1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH2 <em>H2</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH3 <em>H3</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH4 <em>H4</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH5 <em>H5</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH6 <em>H6</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getUl <em>Ul</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getOl <em>Ol</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDl <em>Dl</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getPre <em>Pre</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getBlockquote <em>Blockquote</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getAddress <em>Address</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getHr <em>Hr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType()
  * @model extendedMetaData="name='div' kind='mixed'"
  * @generated
  */
 public interface XhtmlDivType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -101,31 +95,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Flow Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Flow Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Flow Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Flow Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Flow Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_XhtmlFlowMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlFlowMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlFlowMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlFlowMix();
 
 	/**
-	 * Returns the value of the '<em><b>H1</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H1</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H1</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H1</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H1</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_H1()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -135,14 +129,14 @@
 	EList<XhtmlH1Type> getH1();
 
 	/**
-	 * Returns the value of the '<em><b>H2</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H2</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H2</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H2</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H2</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_H2()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -152,14 +146,14 @@
 	EList<XhtmlH2Type> getH2();
 
 	/**
-	 * Returns the value of the '<em><b>H3</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H3</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H3</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H3</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H3</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_H3()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -169,14 +163,14 @@
 	EList<XhtmlH3Type> getH3();
 
 	/**
-	 * Returns the value of the '<em><b>H4</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H4</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H4</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H4</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H4</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_H4()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -186,14 +180,14 @@
 	EList<XhtmlH4Type> getH4();
 
 	/**
-	 * Returns the value of the '<em><b>H5</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H5</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H5</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H5</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H5</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_H5()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -203,14 +197,14 @@
 	EList<XhtmlH5Type> getH5();
 
 	/**
-	 * Returns the value of the '<em><b>H6</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H6</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H6</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H6</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H6</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_H6()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -220,14 +214,14 @@
 	EList<XhtmlH6Type> getH6();
 
 	/**
-	 * Returns the value of the '<em><b>Ul</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ul</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ul</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ul</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ul</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Ul()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -237,14 +231,14 @@
 	EList<XhtmlUlType> getUl();
 
 	/**
-	 * Returns the value of the '<em><b>Ol</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ol</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ol</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ol</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ol</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Ol()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -254,14 +248,14 @@
 	EList<XhtmlOlType> getOl();
 
 	/**
-	 * Returns the value of the '<em><b>Dl</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dl</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dl</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dl</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dl</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Dl()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -271,14 +265,14 @@
 	EList<XhtmlDlType> getDl();
 
 	/**
-	 * Returns the value of the '<em><b>P</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>P</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>P</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>P</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>P</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_P()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -288,14 +282,14 @@
 	EList<XhtmlPType> getP();
 
 	/**
-	 * Returns the value of the '<em><b>Div</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Div</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Div</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Div</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Div</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Div()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -305,14 +299,14 @@
 	EList<XhtmlDivType> getDiv();
 
 	/**
-	 * Returns the value of the '<em><b>Pre</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Pre</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Pre</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Pre</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Pre</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Pre()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -322,14 +316,14 @@
 	EList<XhtmlPreType> getPre();
 
 	/**
-	 * Returns the value of the '<em><b>Blockquote</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Blockquote</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Blockquote</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Blockquote</em>' containment reference list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Blockquote</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Blockquote()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -339,14 +333,14 @@
 	EList<XhtmlBlockquoteType> getBlockquote();
 
 	/**
-	 * Returns the value of the '<em><b>Address</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Address</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Address</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Address</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Address</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Address()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -356,14 +350,14 @@
 	EList<XhtmlAddressType> getAddress();
 
 	/**
-	 * Returns the value of the '<em><b>Hr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Hr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -373,14 +367,14 @@
 	EList<XhtmlHrType> getHr();
 
 	/**
-	 * Returns the value of the '<em><b>Table</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Table</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Table</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Table()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -390,14 +384,14 @@
 	EList<XhtmlTableType> getTable();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -407,14 +401,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -424,14 +418,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -441,14 +435,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -458,14 +452,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -475,14 +469,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -492,14 +486,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -509,14 +503,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -526,14 +520,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -543,14 +537,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -560,14 +554,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -577,14 +571,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -594,14 +588,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -611,14 +605,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -628,14 +622,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -645,14 +639,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -662,14 +656,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -679,14 +673,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -696,14 +690,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -713,14 +707,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -730,14 +724,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -747,14 +741,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -764,14 +758,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -781,14 +775,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -798,97 +792,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Lang()
@@ -899,36 +877,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -943,9 +913,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -956,8 +927,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -966,9 +937,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -978,54 +949,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDivType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDlType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDlType.java
index 18e6f37..37d90ba 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDlType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDlType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,47 +12,41 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Dl Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Dl Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getDt <em>Dt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getDd <em>Dd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getGroup <em>Group</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getDt <em>Dt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getDd <em>Dd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDlType()
  * @model extendedMetaData="name='dl' kind='elementOnly'"
  * @generated
  */
 public interface XhtmlDlType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Group</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Group</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Group</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Group</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Group</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDlType_Group()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -62,14 +56,14 @@
 	FeatureMap getGroup();
 
 	/**
-	 * Returns the value of the '<em><b>Dt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDlType_Dt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -79,14 +73,14 @@
 	EList<XhtmlDtType> getDt();
 
 	/**
-	 * Returns the value of the '<em><b>Dd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDlType_Dd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -96,97 +90,81 @@
 	EList<XhtmlDdType> getDd();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDlType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDlType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDlType_Lang()
@@ -197,36 +175,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -240,10 +210,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -254,8 +225,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -264,9 +235,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -276,54 +247,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDlType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDlType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDtType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDtType.java
index 00a0ef0..f9a40f8 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDtType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlDtType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Dt Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Dt Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType()
  * @model extendedMetaData="name='dt' kind='mixed'"
  * @generated
  */
 public interface XhtmlDtType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -654,10 +624,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlDtType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlEditType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlEditType.java
index 406af5f..81e6ea0 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlEditType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlEditType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,88 +14,82 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Edit Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Edit Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH1 <em>H1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH2 <em>H2</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH3 <em>H3</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH4 <em>H4</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH5 <em>H5</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH6 <em>H6</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getUl <em>Ul</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getOl <em>Ol</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDl <em>Dl</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getPre <em>Pre</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getBlockquote <em>Blockquote</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getHr <em>Hr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getCite1 <em>Cite1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDatetime <em>Datetime</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH1 <em>H1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH2 <em>H2</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH3 <em>H3</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH4 <em>H4</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH5 <em>H5</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH6 <em>H6</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getUl <em>Ul</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getOl <em>Ol</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDl <em>Dl</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getPre <em>Pre</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getBlockquote <em>Blockquote</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getAddress <em>Address</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getHr <em>Hr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getCite1 <em>Cite1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDatetime <em>Datetime</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType()
  * @model extendedMetaData="name='edit' kind='mixed'"
  * @generated
  */
 public interface XhtmlEditType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -105,31 +99,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Flow Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Flow Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Flow Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Flow Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Flow Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_XhtmlFlowMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlFlowMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlFlowMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlFlowMix();
 
 	/**
-	 * Returns the value of the '<em><b>H1</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H1</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H1</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H1</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H1</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_H1()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -139,14 +133,14 @@
 	EList<XhtmlH1Type> getH1();
 
 	/**
-	 * Returns the value of the '<em><b>H2</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H2</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H2</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H2</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H2</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_H2()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -156,14 +150,14 @@
 	EList<XhtmlH2Type> getH2();
 
 	/**
-	 * Returns the value of the '<em><b>H3</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H3</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H3</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H3</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H3</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_H3()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -173,14 +167,14 @@
 	EList<XhtmlH3Type> getH3();
 
 	/**
-	 * Returns the value of the '<em><b>H4</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H4</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H4</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H4</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H4</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_H4()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -190,14 +184,14 @@
 	EList<XhtmlH4Type> getH4();
 
 	/**
-	 * Returns the value of the '<em><b>H5</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H5</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H5</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H5</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H5</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_H5()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -207,14 +201,14 @@
 	EList<XhtmlH5Type> getH5();
 
 	/**
-	 * Returns the value of the '<em><b>H6</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H6</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H6</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H6</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H6</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_H6()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -224,14 +218,14 @@
 	EList<XhtmlH6Type> getH6();
 
 	/**
-	 * Returns the value of the '<em><b>Ul</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ul</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ul</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ul</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ul</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Ul()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -241,14 +235,14 @@
 	EList<XhtmlUlType> getUl();
 
 	/**
-	 * Returns the value of the '<em><b>Ol</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ol</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ol</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ol</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ol</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Ol()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -258,14 +252,14 @@
 	EList<XhtmlOlType> getOl();
 
 	/**
-	 * Returns the value of the '<em><b>Dl</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dl</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dl</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dl</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dl</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Dl()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -275,14 +269,14 @@
 	EList<XhtmlDlType> getDl();
 
 	/**
-	 * Returns the value of the '<em><b>P</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>P</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>P</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>P</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>P</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_P()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -292,14 +286,14 @@
 	EList<XhtmlPType> getP();
 
 	/**
-	 * Returns the value of the '<em><b>Div</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Div</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Div</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Div</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Div</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Div()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -309,14 +303,14 @@
 	EList<XhtmlDivType> getDiv();
 
 	/**
-	 * Returns the value of the '<em><b>Pre</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Pre</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Pre</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Pre</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Pre</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Pre()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -326,14 +320,14 @@
 	EList<XhtmlPreType> getPre();
 
 	/**
-	 * Returns the value of the '<em><b>Blockquote</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Blockquote</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Blockquote</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Blockquote</em>' containment reference list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Blockquote</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Blockquote()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -343,14 +337,14 @@
 	EList<XhtmlBlockquoteType> getBlockquote();
 
 	/**
-	 * Returns the value of the '<em><b>Address</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Address</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Address</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Address</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Address</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Address()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -360,14 +354,14 @@
 	EList<XhtmlAddressType> getAddress();
 
 	/**
-	 * Returns the value of the '<em><b>Hr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Hr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -377,14 +371,14 @@
 	EList<XhtmlHrType> getHr();
 
 	/**
-	 * Returns the value of the '<em><b>Table</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Table</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Table</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Table()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -394,14 +388,14 @@
 	EList<XhtmlTableType> getTable();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -411,14 +405,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -428,14 +422,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -445,14 +439,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -462,14 +456,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -479,14 +473,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -496,14 +490,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -513,14 +507,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -530,14 +524,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -547,14 +541,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -564,14 +558,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -581,14 +575,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -598,14 +592,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -615,14 +609,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -632,14 +626,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -649,14 +643,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -666,14 +660,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -683,14 +677,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -700,14 +694,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -717,14 +711,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -734,14 +728,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -751,14 +745,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -768,14 +762,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -785,14 +779,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -802,151 +796,135 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Cite1</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite1</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite1</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite1</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite1</em>' attribute.
 	 * @see #setCite1(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Cite1()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.URI"
-	 *        extendedMetaData="kind='attribute' name='cite'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.URI" extendedMetaData="kind='attribute' name='cite'"
 	 * @generated
 	 */
 	String getCite1();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getCite1 <em>Cite1</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cite1</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Cite1</em>' attribute.
 	 * @see #getCite1()
 	 * @generated
 	 */
 	void setCite1(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Datetime</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Datetime</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Datetime</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Datetime</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Datetime</em>' attribute.
 	 * @see #setDatetime(XMLGregorianCalendar)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Datetime()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Datetime"
-	 *        extendedMetaData="kind='attribute' name='datetime'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Datetime" extendedMetaData="kind='attribute' name='datetime'"
 	 * @generated
 	 */
 	XMLGregorianCalendar getDatetime();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDatetime <em>Datetime</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Datetime</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDatetime <em>Datetime</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Datetime</em>' attribute.
 	 * @see #getDatetime()
 	 * @generated
 	 */
 	void setDatetime(XMLGregorianCalendar value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Lang()
@@ -957,36 +935,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -1001,9 +971,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -1014,8 +985,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -1024,9 +995,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -1036,54 +1007,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEditType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlEmType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlEmType.java
index bc1cd54..3cbac23 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlEmType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlEmType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Em Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Em Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType()
  * @model extendedMetaData="name='em' kind='mixed'"
  * @generated
  */
 public interface XhtmlEmType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -654,10 +624,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlEmType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlFactory.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlFactory.java
index 87a278e..958a88f 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlFactory.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,461 +14,410 @@
 import org.eclipse.emf.ecore.EFactory;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
+ * the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage
  * @generated
  */
 public interface XhtmlFactory extends EFactory {
 	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	XhtmlFactory eINSTANCE = org.eclipse.rmf.reqif10.xhtml.impl.XhtmlFactoryImpl.init();
 
 	/**
-	 * Returns a new object of class '<em>Document Root</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Document Root</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Document Root</em>'.
 	 * @generated
 	 */
 	DocumentRoot createDocumentRoot();
 
 	/**
-	 * Returns a new object of class '<em>Abbr Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Abbr Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Abbr Type</em>'.
 	 * @generated
 	 */
 	XhtmlAbbrType createXhtmlAbbrType();
 
 	/**
-	 * Returns a new object of class '<em>Acronym Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Acronym Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Acronym Type</em>'.
 	 * @generated
 	 */
 	XhtmlAcronymType createXhtmlAcronymType();
 
 	/**
-	 * Returns a new object of class '<em>Address Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Address Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Address Type</em>'.
 	 * @generated
 	 */
 	XhtmlAddressType createXhtmlAddressType();
 
 	/**
-	 * Returns a new object of class '<em>AType</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>AType</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>AType</em>'.
 	 * @generated
 	 */
 	XhtmlAType createXhtmlAType();
 
 	/**
-	 * Returns a new object of class '<em>Blockquote Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Blockquote Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Blockquote Type</em>'.
 	 * @generated
 	 */
 	XhtmlBlockquoteType createXhtmlBlockquoteType();
 
 	/**
-	 * Returns a new object of class '<em>Br Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Br Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Br Type</em>'.
 	 * @generated
 	 */
 	XhtmlBrType createXhtmlBrType();
 
 	/**
-	 * Returns a new object of class '<em>Caption Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Caption Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Caption Type</em>'.
 	 * @generated
 	 */
 	XhtmlCaptionType createXhtmlCaptionType();
 
 	/**
-	 * Returns a new object of class '<em>Cite Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Cite Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Cite Type</em>'.
 	 * @generated
 	 */
 	XhtmlCiteType createXhtmlCiteType();
 
 	/**
-	 * Returns a new object of class '<em>Code Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Code Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Code Type</em>'.
 	 * @generated
 	 */
 	XhtmlCodeType createXhtmlCodeType();
 
 	/**
-	 * Returns a new object of class '<em>Colgroup Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Colgroup Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Colgroup Type</em>'.
 	 * @generated
 	 */
 	XhtmlColgroupType createXhtmlColgroupType();
 
 	/**
-	 * Returns a new object of class '<em>Col Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Col Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Col Type</em>'.
 	 * @generated
 	 */
 	XhtmlColType createXhtmlColType();
 
 	/**
-	 * Returns a new object of class '<em>Dd Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Dd Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Dd Type</em>'.
 	 * @generated
 	 */
 	XhtmlDdType createXhtmlDdType();
 
 	/**
-	 * Returns a new object of class '<em>Dfn Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Dfn Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Dfn Type</em>'.
 	 * @generated
 	 */
 	XhtmlDfnType createXhtmlDfnType();
 
 	/**
-	 * Returns a new object of class '<em>Div Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Div Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Div Type</em>'.
 	 * @generated
 	 */
 	XhtmlDivType createXhtmlDivType();
 
 	/**
-	 * Returns a new object of class '<em>Dl Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Dl Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Dl Type</em>'.
 	 * @generated
 	 */
 	XhtmlDlType createXhtmlDlType();
 
 	/**
-	 * Returns a new object of class '<em>Dt Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Dt Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Dt Type</em>'.
 	 * @generated
 	 */
 	XhtmlDtType createXhtmlDtType();
 
 	/**
-	 * Returns a new object of class '<em>Edit Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Edit Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Edit Type</em>'.
 	 * @generated
 	 */
 	XhtmlEditType createXhtmlEditType();
 
 	/**
-	 * Returns a new object of class '<em>Em Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Em Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Em Type</em>'.
 	 * @generated
 	 */
 	XhtmlEmType createXhtmlEmType();
 
 	/**
-	 * Returns a new object of class '<em>H1 Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>H1 Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>H1 Type</em>'.
 	 * @generated
 	 */
 	XhtmlH1Type createXhtmlH1Type();
 
 	/**
-	 * Returns a new object of class '<em>H2 Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>H2 Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>H2 Type</em>'.
 	 * @generated
 	 */
 	XhtmlH2Type createXhtmlH2Type();
 
 	/**
-	 * Returns a new object of class '<em>H3 Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>H3 Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>H3 Type</em>'.
 	 * @generated
 	 */
 	XhtmlH3Type createXhtmlH3Type();
 
 	/**
-	 * Returns a new object of class '<em>H4 Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>H4 Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>H4 Type</em>'.
 	 * @generated
 	 */
 	XhtmlH4Type createXhtmlH4Type();
 
 	/**
-	 * Returns a new object of class '<em>H5 Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>H5 Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>H5 Type</em>'.
 	 * @generated
 	 */
 	XhtmlH5Type createXhtmlH5Type();
 
 	/**
-	 * Returns a new object of class '<em>H6 Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>H6 Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>H6 Type</em>'.
 	 * @generated
 	 */
 	XhtmlH6Type createXhtmlH6Type();
 
 	/**
-	 * Returns a new object of class '<em>Heading Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Heading Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Heading Type</em>'.
 	 * @generated
 	 */
 	XhtmlHeadingType createXhtmlHeadingType();
 
 	/**
-	 * Returns a new object of class '<em>Hr Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Hr Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Hr Type</em>'.
 	 * @generated
 	 */
 	XhtmlHrType createXhtmlHrType();
 
 	/**
-	 * Returns a new object of class '<em>Inl Pres Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Inl Pres Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Inl Pres Type</em>'.
 	 * @generated
 	 */
 	XhtmlInlPresType createXhtmlInlPresType();
 
 	/**
-	 * Returns a new object of class '<em>Kbd Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Kbd Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Kbd Type</em>'.
 	 * @generated
 	 */
 	XhtmlKbdType createXhtmlKbdType();
 
 	/**
-	 * Returns a new object of class '<em>Li Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Li Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Li Type</em>'.
 	 * @generated
 	 */
 	XhtmlLiType createXhtmlLiType();
 
 	/**
-	 * Returns a new object of class '<em>Object Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Object Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Object Type</em>'.
 	 * @generated
 	 */
 	XhtmlObjectType createXhtmlObjectType();
 
 	/**
-	 * Returns a new object of class '<em>Ol Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Ol Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Ol Type</em>'.
 	 * @generated
 	 */
 	XhtmlOlType createXhtmlOlType();
 
 	/**
-	 * Returns a new object of class '<em>Param Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Param Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Param Type</em>'.
 	 * @generated
 	 */
 	XhtmlParamType createXhtmlParamType();
 
 	/**
-	 * Returns a new object of class '<em>Pre Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Pre Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Pre Type</em>'.
 	 * @generated
 	 */
 	XhtmlPreType createXhtmlPreType();
 
 	/**
-	 * Returns a new object of class '<em>PType</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>PType</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>PType</em>'.
 	 * @generated
 	 */
 	XhtmlPType createXhtmlPType();
 
 	/**
-	 * Returns a new object of class '<em>QType</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>QType</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>QType</em>'.
 	 * @generated
 	 */
 	XhtmlQType createXhtmlQType();
 
 	/**
-	 * Returns a new object of class '<em>Samp Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Samp Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Samp Type</em>'.
 	 * @generated
 	 */
 	XhtmlSampType createXhtmlSampType();
 
 	/**
-	 * Returns a new object of class '<em>Span Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Span Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Span Type</em>'.
 	 * @generated
 	 */
 	XhtmlSpanType createXhtmlSpanType();
 
 	/**
-	 * Returns a new object of class '<em>Strong Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Strong Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Strong Type</em>'.
 	 * @generated
 	 */
 	XhtmlStrongType createXhtmlStrongType();
 
 	/**
-	 * Returns a new object of class '<em>Table Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Table Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Table Type</em>'.
 	 * @generated
 	 */
 	XhtmlTableType createXhtmlTableType();
 
 	/**
-	 * Returns a new object of class '<em>Tbody Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Tbody Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Tbody Type</em>'.
 	 * @generated
 	 */
 	XhtmlTbodyType createXhtmlTbodyType();
 
 	/**
-	 * Returns a new object of class '<em>Td Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Td Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Td Type</em>'.
 	 * @generated
 	 */
 	XhtmlTdType createXhtmlTdType();
 
 	/**
-	 * Returns a new object of class '<em>Tfoot Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Tfoot Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Tfoot Type</em>'.
 	 * @generated
 	 */
 	XhtmlTfootType createXhtmlTfootType();
 
 	/**
-	 * Returns a new object of class '<em>Thead Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Thead Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Thead Type</em>'.
 	 * @generated
 	 */
 	XhtmlTheadType createXhtmlTheadType();
 
 	/**
-	 * Returns a new object of class '<em>Th Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Th Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Th Type</em>'.
 	 * @generated
 	 */
 	XhtmlThType createXhtmlThType();
 
 	/**
-	 * Returns a new object of class '<em>Tr Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Tr Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Tr Type</em>'.
 	 * @generated
 	 */
 	XhtmlTrType createXhtmlTrType();
 
 	/**
-	 * Returns a new object of class '<em>Ul Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Ul Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Ul Type</em>'.
 	 * @generated
 	 */
 	XhtmlUlType createXhtmlUlType();
 
 	/**
-	 * Returns a new object of class '<em>Var Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Var Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Var Type</em>'.
 	 * @generated
 	 */
 	XhtmlVarType createXhtmlVarType();
 
 	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
 	XhtmlPackage getXhtmlPackage();
 
-} //XhtmlFactory
+} // XhtmlFactory
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH1Type.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH1Type.java
index 7aaf6f2..81de785 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH1Type.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH1Type.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>H1 Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>H1 Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type()
  * @model extendedMetaData="name='h1' kind='mixed'"
  * @generated
  */
 public interface XhtmlH1Type extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -654,10 +624,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH1Type_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH2Type.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH2Type.java
index 384659e..ae14cb2 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH2Type.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH2Type.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>H2 Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>H2 Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type()
  * @model extendedMetaData="name='h2' kind='mixed'"
  * @generated
  */
 public interface XhtmlH2Type extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -654,10 +624,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH2Type_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH3Type.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH3Type.java
index 77247f3..4c79b95 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH3Type.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH3Type.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>H3 Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>H3 Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type()
  * @model extendedMetaData="name='h3' kind='mixed'"
  * @generated
  */
 public interface XhtmlH3Type extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -654,10 +624,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH3Type_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH4Type.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH4Type.java
index 6525129..6361ac3 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH4Type.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH4Type.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>H4 Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>H4 Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type()
  * @model extendedMetaData="name='h4' kind='mixed'"
  * @generated
  */
 public interface XhtmlH4Type extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -654,10 +624,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH4Type_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH5Type.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH5Type.java
index 58d5651..88830aa 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH5Type.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH5Type.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>H5 Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>H5 Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type()
  * @model extendedMetaData="name='h5' kind='mixed'"
  * @generated
  */
 public interface XhtmlH5Type extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -654,10 +624,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH5Type_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH6Type.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH6Type.java
index 680da51..167a08a 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH6Type.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlH6Type.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>H6 Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>H6 Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type()
  * @model extendedMetaData="name='h6' kind='mixed'"
  * @generated
  */
 public interface XhtmlH6Type extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -654,10 +624,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlH6Type_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlHeadingType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlHeadingType.java
index 4f21c9e..18ade7c 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlHeadingType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlHeadingType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Heading Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Heading Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType()
  * @model extendedMetaData="name='heading' kind='mixed'"
  * @generated
  */
 public interface XhtmlHeadingType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getClass_ <em>Class</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Lang()
@@ -612,35 +590,27 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -655,9 +625,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -667,9 +638,9 @@
 	void setSpace(SpaceType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSpace <em>Space</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHeadingType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlHrType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlHrType.java
index 6810a3e..0e91561 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlHrType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlHrType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,123 +12,103 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Hr Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Hr Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHrType()
  * @model extendedMetaData="name='hr' kind='elementOnly'"
  * @generated
  */
 public interface XhtmlHrType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHrType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHrType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHrType_Lang()
@@ -139,36 +119,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -182,10 +154,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -196,8 +169,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -206,9 +179,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -218,54 +191,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHrType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlHrType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlInlPresType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlInlPresType.java
index 4b9a055..0e6fa80 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlInlPresType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlInlPresType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Inl Pres Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Inl Pres Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType()
  * @model extendedMetaData="name='InlPres' kind='mixed'"
  * @generated
  */
 public interface XhtmlInlPresType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getClass_ <em>Class</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Lang()
@@ -612,35 +590,27 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -655,9 +625,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -667,9 +638,9 @@
 	void setSpace(SpaceType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSpace <em>Space</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlInlPresType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlKbdType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlKbdType.java
index fa0dbf9..09e36e7 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlKbdType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlKbdType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Kbd Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Kbd Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType()
  * @model extendedMetaData="name='kbd' kind='mixed'"
  * @generated
  */
 public interface XhtmlKbdType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -655,9 +625,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlKbdType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlLiType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlLiType.java
index 2ead5c1..db6052b 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlLiType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlLiType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,86 +12,80 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Li Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Li Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH1 <em>H1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH2 <em>H2</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH3 <em>H3</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH4 <em>H4</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH5 <em>H5</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH6 <em>H6</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getUl <em>Ul</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getOl <em>Ol</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDl <em>Dl</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getPre <em>Pre</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getBlockquote <em>Blockquote</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getHr <em>Hr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH1 <em>H1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH2 <em>H2</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH3 <em>H3</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH4 <em>H4</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH5 <em>H5</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH6 <em>H6</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getUl <em>Ul</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getOl <em>Ol</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDl <em>Dl</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getPre <em>Pre</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getBlockquote <em>Blockquote</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getAddress <em>Address</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getHr <em>Hr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType()
  * @model extendedMetaData="name='li' kind='mixed'"
  * @generated
  */
 public interface XhtmlLiType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -101,31 +95,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Flow Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Flow Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Flow Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Flow Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Flow Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_XhtmlFlowMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlFlowMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlFlowMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlFlowMix();
 
 	/**
-	 * Returns the value of the '<em><b>H1</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H1</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H1</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H1</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H1</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_H1()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -135,14 +129,14 @@
 	EList<XhtmlH1Type> getH1();
 
 	/**
-	 * Returns the value of the '<em><b>H2</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H2</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H2</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H2</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H2</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_H2()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -152,14 +146,14 @@
 	EList<XhtmlH2Type> getH2();
 
 	/**
-	 * Returns the value of the '<em><b>H3</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H3</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H3</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H3</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H3</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_H3()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -169,14 +163,14 @@
 	EList<XhtmlH3Type> getH3();
 
 	/**
-	 * Returns the value of the '<em><b>H4</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H4</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H4</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H4</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H4</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_H4()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -186,14 +180,14 @@
 	EList<XhtmlH4Type> getH4();
 
 	/**
-	 * Returns the value of the '<em><b>H5</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H5</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H5</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H5</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H5</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_H5()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -203,14 +197,14 @@
 	EList<XhtmlH5Type> getH5();
 
 	/**
-	 * Returns the value of the '<em><b>H6</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H6</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H6</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H6</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H6</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_H6()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -220,14 +214,14 @@
 	EList<XhtmlH6Type> getH6();
 
 	/**
-	 * Returns the value of the '<em><b>Ul</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ul</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ul</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ul</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ul</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Ul()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -237,14 +231,14 @@
 	EList<XhtmlUlType> getUl();
 
 	/**
-	 * Returns the value of the '<em><b>Ol</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ol</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ol</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ol</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ol</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Ol()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -254,14 +248,14 @@
 	EList<XhtmlOlType> getOl();
 
 	/**
-	 * Returns the value of the '<em><b>Dl</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dl</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dl</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dl</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dl</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Dl()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -271,14 +265,14 @@
 	EList<XhtmlDlType> getDl();
 
 	/**
-	 * Returns the value of the '<em><b>P</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>P</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>P</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>P</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>P</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_P()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -288,14 +282,14 @@
 	EList<XhtmlPType> getP();
 
 	/**
-	 * Returns the value of the '<em><b>Div</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Div</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Div</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Div</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Div</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Div()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -305,14 +299,14 @@
 	EList<XhtmlDivType> getDiv();
 
 	/**
-	 * Returns the value of the '<em><b>Pre</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Pre</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Pre</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Pre</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Pre</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Pre()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -322,14 +316,14 @@
 	EList<XhtmlPreType> getPre();
 
 	/**
-	 * Returns the value of the '<em><b>Blockquote</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Blockquote</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Blockquote</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Blockquote</em>' containment reference list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Blockquote</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Blockquote()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -339,14 +333,14 @@
 	EList<XhtmlBlockquoteType> getBlockquote();
 
 	/**
-	 * Returns the value of the '<em><b>Address</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Address</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Address</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Address</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Address</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Address()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -356,14 +350,14 @@
 	EList<XhtmlAddressType> getAddress();
 
 	/**
-	 * Returns the value of the '<em><b>Hr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Hr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -373,14 +367,14 @@
 	EList<XhtmlHrType> getHr();
 
 	/**
-	 * Returns the value of the '<em><b>Table</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Table</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Table</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Table()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -390,14 +384,14 @@
 	EList<XhtmlTableType> getTable();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -407,14 +401,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -424,14 +418,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -441,14 +435,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -458,14 +452,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -475,14 +469,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -492,14 +486,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -509,14 +503,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -526,14 +520,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -543,14 +537,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -560,14 +554,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -577,14 +571,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -594,14 +588,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -611,14 +605,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -628,14 +622,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -645,14 +639,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -662,14 +656,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -679,14 +673,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -696,14 +690,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -713,14 +707,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -730,14 +724,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -747,14 +741,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -764,14 +758,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -781,14 +775,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -798,97 +792,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Lang()
@@ -899,36 +877,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -942,10 +912,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -956,8 +927,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -966,9 +937,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -978,54 +949,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlLiType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlObjectType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlObjectType.java
index 84ae6a2..a8a6114 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlObjectType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlObjectType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,103 +12,96 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import java.math.BigInteger;
-
 import java.util.List;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Object Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Object Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getParam <em>Param</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH1 <em>H1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH2 <em>H2</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH3 <em>H3</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH4 <em>H4</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH5 <em>H5</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH6 <em>H6</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getUl <em>Ul</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getOl <em>Ol</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDl <em>Dl</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getPre <em>Pre</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getBlockquote <em>Blockquote</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getHr <em>Hr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getArchive <em>Archive</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getClassid <em>Classid</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCodebase <em>Codebase</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCodetype <em>Codetype</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getData <em>Data</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDeclare <em>Declare</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getHeight <em>Height</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStandby <em>Standby</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTabindex <em>Tabindex</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getGroup <em>Group</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getParam <em>Param</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH1 <em>H1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH2 <em>H2</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH3 <em>H3</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH4 <em>H4</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH5 <em>H5</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH6 <em>H6</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getUl <em>Ul</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getOl <em>Ol</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDl <em>Dl</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getPre <em>Pre</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getBlockquote <em>Blockquote</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getAddress <em>Address</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getHr <em>Hr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getArchive <em>Archive</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getClassid <em>Classid</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCodebase <em>Codebase</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCodetype <em>Codetype</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getData <em>Data</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDeclare <em>Declare</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getHeight <em>Height</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStandby <em>Standby</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTabindex <em>Tabindex</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getWidth <em>Width</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType()
  * @model extendedMetaData="name='object' kind='mixed'"
  * @generated
  */
 public interface XhtmlObjectType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -118,31 +111,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Group</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Group</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Group</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Group</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Group</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Group()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='group:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='group:1'"
 	 * @generated
 	 */
 	FeatureMap getGroup();
 
 	/**
-	 * Returns the value of the '<em><b>Param</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Param</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Param</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Param</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Param</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Param()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -152,14 +145,14 @@
 	EList<XhtmlParamType> getParam();
 
 	/**
-	 * Returns the value of the '<em><b>H1</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H1</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H1</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H1</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H1</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_H1()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -169,14 +162,14 @@
 	EList<XhtmlH1Type> getH1();
 
 	/**
-	 * Returns the value of the '<em><b>H2</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H2</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H2</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H2</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H2</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_H2()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -186,14 +179,14 @@
 	EList<XhtmlH2Type> getH2();
 
 	/**
-	 * Returns the value of the '<em><b>H3</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H3</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H3</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H3</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H3</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_H3()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -203,14 +196,14 @@
 	EList<XhtmlH3Type> getH3();
 
 	/**
-	 * Returns the value of the '<em><b>H4</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H4</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H4</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H4</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H4</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_H4()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -220,14 +213,14 @@
 	EList<XhtmlH4Type> getH4();
 
 	/**
-	 * Returns the value of the '<em><b>H5</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H5</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H5</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H5</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H5</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_H5()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -237,14 +230,14 @@
 	EList<XhtmlH5Type> getH5();
 
 	/**
-	 * Returns the value of the '<em><b>H6</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H6</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H6</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H6</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H6</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_H6()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -254,14 +247,14 @@
 	EList<XhtmlH6Type> getH6();
 
 	/**
-	 * Returns the value of the '<em><b>Ul</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ul</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ul</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ul</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ul</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Ul()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -271,14 +264,14 @@
 	EList<XhtmlUlType> getUl();
 
 	/**
-	 * Returns the value of the '<em><b>Ol</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ol</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ol</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ol</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ol</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Ol()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -288,14 +281,14 @@
 	EList<XhtmlOlType> getOl();
 
 	/**
-	 * Returns the value of the '<em><b>Dl</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dl</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dl</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dl</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dl</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Dl()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -305,14 +298,14 @@
 	EList<XhtmlDlType> getDl();
 
 	/**
-	 * Returns the value of the '<em><b>P</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>P</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>P</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>P</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>P</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_P()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -322,14 +315,14 @@
 	EList<XhtmlPType> getP();
 
 	/**
-	 * Returns the value of the '<em><b>Div</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Div</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Div</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Div</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Div</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Div()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -339,14 +332,14 @@
 	EList<XhtmlDivType> getDiv();
 
 	/**
-	 * Returns the value of the '<em><b>Pre</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Pre</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Pre</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Pre</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Pre</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Pre()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -356,14 +349,14 @@
 	EList<XhtmlPreType> getPre();
 
 	/**
-	 * Returns the value of the '<em><b>Blockquote</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Blockquote</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Blockquote</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Blockquote</em>' containment reference list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Blockquote</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Blockquote()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -373,14 +366,14 @@
 	EList<XhtmlBlockquoteType> getBlockquote();
 
 	/**
-	 * Returns the value of the '<em><b>Address</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Address</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Address</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Address</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Address</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Address()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -390,14 +383,14 @@
 	EList<XhtmlAddressType> getAddress();
 
 	/**
-	 * Returns the value of the '<em><b>Hr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Hr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -407,14 +400,14 @@
 	EList<XhtmlHrType> getHr();
 
 	/**
-	 * Returns the value of the '<em><b>Table</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Table</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Table</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Table()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -424,14 +417,14 @@
 	EList<XhtmlTableType> getTable();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -441,14 +434,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -458,14 +451,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -475,14 +468,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -492,14 +485,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -509,14 +502,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -526,14 +519,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -543,14 +536,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -560,14 +553,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -577,14 +570,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -594,14 +587,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -611,14 +604,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -628,14 +621,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -645,14 +638,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -662,14 +655,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -679,14 +672,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -696,14 +689,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -713,14 +706,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -730,14 +723,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -747,14 +740,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -764,14 +757,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -781,14 +774,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -798,14 +791,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -815,14 +808,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -832,13 +825,13 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Archive</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Archive</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Archive</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Archive</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Archive</em>' attribute.
 	 * @see #setArchive(List)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Archive()
@@ -849,104 +842,105 @@
 	List<String> getArchive();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getArchive <em>Archive</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Archive</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getArchive <em>Archive</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Archive</em>' attribute.
 	 * @see #getArchive()
 	 * @generated
 	 */
 	void setArchive(List<String> value);
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Classid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Classid</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Classid</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Classid</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Classid</em>' attribute.
 	 * @see #setClassid(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Classid()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.URI"
-	 *        extendedMetaData="kind='attribute' name='classid'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.URI" extendedMetaData="kind='attribute' name='classid'"
 	 * @generated
 	 */
 	String getClassid();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getClassid <em>Classid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Classid</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getClassid <em>Classid</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Classid</em>' attribute.
 	 * @see #getClassid()
 	 * @generated
 	 */
 	void setClassid(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Codebase</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Codebase</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Codebase</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Codebase</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Codebase</em>' attribute.
 	 * @see #setCodebase(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Codebase()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.URI"
-	 *        extendedMetaData="kind='attribute' name='codebase'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.URI" extendedMetaData="kind='attribute' name='codebase'"
 	 * @generated
 	 */
 	String getCodebase();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCodebase <em>Codebase</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Codebase</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCodebase <em>Codebase</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Codebase</em>' attribute.
 	 * @see #getCodebase()
 	 * @generated
 	 */
 	void setCodebase(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Codetype</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Codetype</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Codetype</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Codetype</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Codetype</em>' attribute.
 	 * @see #setCodetype(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Codetype()
@@ -957,68 +951,68 @@
 	String getCodetype();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCodetype <em>Codetype</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Codetype</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCodetype <em>Codetype</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Codetype</em>' attribute.
 	 * @see #getCodetype()
 	 * @generated
 	 */
 	void setCodetype(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Data</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Data</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Data</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Data</em>' attribute.
 	 * @see #setData(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Data()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.URI"
-	 *        extendedMetaData="kind='attribute' name='data'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.URI" extendedMetaData="kind='attribute' name='data'"
 	 * @generated
 	 */
 	String getData();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getData <em>Data</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Data</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Data</em>' attribute.
 	 * @see #getData()
 	 * @generated
 	 */
 	void setData(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Declare</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.DeclareType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Declare</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.DeclareType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Declare</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Declare</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Declare</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.DeclareType
 	 * @see #isSetDeclare()
 	 * @see #unsetDeclare()
 	 * @see #setDeclare(DeclareType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Declare()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='declare'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='declare'"
 	 * @generated
 	 */
 	DeclareType getDeclare();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDeclare <em>Declare</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Declare</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDeclare <em>Declare</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Declare</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.DeclareType
 	 * @see #isSetDeclare()
 	 * @see #unsetDeclare()
@@ -1028,9 +1022,9 @@
 	void setDeclare(DeclareType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDeclare <em>Declare</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDeclare <em>Declare</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDeclare()
 	 * @see #getDeclare()
 	 * @see #setDeclare(DeclareType)
@@ -1039,9 +1033,9 @@
 	void unsetDeclare();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDeclare <em>Declare</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDeclare
+	 * <em>Declare</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Declare</em>' attribute is set.
 	 * @see #unsetDeclare()
 	 * @see #getDeclare()
@@ -1051,97 +1045,81 @@
 	boolean isSetDeclare();
 
 	/**
-	 * Returns the value of the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Height</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Height</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Height</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Height</em>' attribute.
 	 * @see #setHeight(Object)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Height()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length"
-	 *        extendedMetaData="kind='attribute' name='height'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length" extendedMetaData="kind='attribute' name='height'"
 	 * @generated
 	 */
 	Object getHeight();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getHeight <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Height</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getHeight <em>Height</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Height</em>' attribute.
 	 * @see #getHeight()
 	 * @generated
 	 */
 	void setHeight(Object value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Lang()
@@ -1153,62 +1131,53 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Name()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='name'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='name'"
 	 * @generated
 	 */
 	String getName();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
 	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -1223,9 +1192,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -1235,9 +1205,9 @@
 	void setSpace(SpaceType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSpace <em>Space</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -1246,9 +1216,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -1258,162 +1228,161 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Standby</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Standby</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Standby</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Standby</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Standby</em>' attribute.
 	 * @see #setStandby(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Standby()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Text"
-	 *        extendedMetaData="kind='attribute' name='standby'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Text" extendedMetaData="kind='attribute' name='standby'"
 	 * @generated
 	 */
 	String getStandby();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStandby <em>Standby</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Standby</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStandby <em>Standby</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Standby</em>' attribute.
 	 * @see #getStandby()
 	 * @generated
 	 */
 	void setStandby(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Tabindex</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tabindex</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tabindex</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tabindex</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tabindex</em>' attribute.
 	 * @see #setTabindex(BigInteger)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Tabindex()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Number"
-	 *        extendedMetaData="kind='attribute' name='tabindex'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Number" extendedMetaData="kind='attribute' name='tabindex'"
 	 * @generated
 	 */
 	BigInteger getTabindex();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTabindex <em>Tabindex</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Tabindex</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTabindex <em>Tabindex</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Tabindex</em>' attribute.
 	 * @see #getTabindex()
 	 * @generated
 	 */
 	void setTabindex(BigInteger value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
 	void setTitle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' attribute.
 	 * @see #setType(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Type()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.ContentType"
-	 *        extendedMetaData="kind='attribute' name='type'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.ContentType" extendedMetaData="kind='attribute' name='type'"
 	 * @generated
 	 */
 	String getType();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Type</em>' attribute.
 	 * @see #getType()
 	 * @generated
 	 */
 	void setType(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Width</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Width</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Width</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Width</em>' attribute.
 	 * @see #setWidth(Object)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlObjectType_Width()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length"
-	 *        extendedMetaData="kind='attribute' name='width'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length" extendedMetaData="kind='attribute' name='width'"
 	 * @generated
 	 */
 	Object getWidth();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getWidth <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Width</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Width</em>' attribute.
 	 * @see #getWidth()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlOlType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlOlType.java
index f074ab7..f092728 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlOlType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlOlType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,43 +12,38 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Ol Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Ol Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getLi <em>Li</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getLi <em>Li</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlOlType()
  * @model extendedMetaData="name='ol' kind='elementOnly'"
  * @generated
  */
 public interface XhtmlOlType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Li</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Li</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Li</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Li</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Li</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlOlType_Li()
 	 * @model containment="true" required="true"
@@ -58,97 +53,81 @@
 	EList<XhtmlLiType> getLi();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlOlType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlOlType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlOlType_Lang()
@@ -159,36 +138,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -202,10 +173,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -216,8 +188,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -226,9 +198,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -238,54 +210,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlOlType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlOlType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlPType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlPType.java
index 3e52ed8..f176ce7 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlPType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlPType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>PType</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>PType</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType()
  * @model extendedMetaData="name='p' kind='mixed'"
  * @generated
  */
 public interface XhtmlPType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getClass_ <em>Class</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -654,10 +624,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlPackage.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlPackage.java
index 0376c5d..6e1b8b4 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlPackage.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlPackage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,472 +19,194 @@
 import org.eclipse.emf.ecore.EReference;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
+ * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
+ * <!-- end-user-doc --> <!-- begin-model-doc --> This is the XML Schema Modular Framework support module for XHTML $Id:
+ * xhtml-framework-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $ XHTML Modular Framework This required module
+ * instantiates the necessary modules needed to support the XHTML modularization framework. The Schema modules
+ * instantiated are: + notations + datatypes + common attributes + character entities This is the XML Schema common
+ * attributes module for XHTML $Id: xhtml-attribs-1.xsd,v 1.1 2010/07/29 13:42:50 bertails Exp $ <div
+ * xmlns="http://www.w3.org/1999/xhtml"> <h1>About the XML namespace</h1> <div class="bodytext">
+ * <p>
+ * This schema document describes the XML namespace, in a form suitable for import by other schema documents.
+ * </p>
+ * <p>
+ * See <a href="http://www.w3.org/XML/1998/namespace.html"> http://www.w3.org/XML/1998/namespace.html</a> and <a
+ * href="http://www.w3.org/TR/REC-xml"> http://www.w3.org/TR/REC-xml</a> for information about this namespace.
+ * </p>
+ * <p>
+ * Note that local names in this namespace are intended to be defined only by the World Wide Web Consortium or its
+ * subgroups. The names currently defined in this namespace are listed below. They should not be used with conflicting
+ * semantics by any Working Group, specification, or document instance.
+ * </p>
+ * <p>
+ * See further below in this document for more information about <a href="#usage">how to refer to this schema document
+ * from your own XSD schema documents</a> and about <a href="#nsversioning">the namespace-versioning policy governing
+ * this schema document</a>.
+ * </p>
+ * </div> </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>Father (in any context at all)</h3> <div
+ * class="bodytext">
+ * <p>
+ * denotes Jon Bosak, the chair of the original XML Working Group. This name is reserved by the following decision of
+ * the W3C XML Plenary and XML Coordination groups:
+ * </p>
+ * <blockquote>
+ * <p>
+ * In appreciation for his vision, leadership and dedication the W3C XML Plenary on this 10th day of February, 2000,
+ * reserves for Jon Bosak in perpetuity the XML name "xml:Father".
+ * </p>
+ * </blockquote> </div> </div> <div id="usage" xml:id="usage" xmlns="http://www.w3.org/1999/xhtml"> <h2><a
+ * name="usage">About this schema document</a></h2> <div class="bodytext">
+ * <p>
+ * This schema defines attributes and an attribute group suitable for use by schemas wishing to allow
+ * <code>xml:base</code>, <code>xml:lang</code>, <code>xml:space</code> or <code>xml:id</code> attributes on elements
+ * they define.
+ * </p>
+ * <p>
+ * To enable this, such a schema must import this schema for the XML namespace, e.g. as follows:
+ * </p>
  * 
- *       This is the XML Schema Modular Framework support module for XHTML
- *       $Id: xhtml-framework-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $
- *     
- * 
- * 
- *       XHTML Modular Framework
- *       This required module instantiates the necessary modules
- *       needed to support the XHTML modularization framework.
- * 
- *       The Schema modules instantiated are:
- *         +  notations
- *         +  datatypes
- *         +  common attributes
- *         +  character entities
- *     
- * 
- * 
- *       This is the XML Schema common attributes module for XHTML
- *       $Id: xhtml-attribs-1.xsd,v 1.1 2010/07/29 13:42:50 bertails Exp $
- *     
- * 
- * 
- * 
- *    <div xmlns="http://www.w3.org/1999/xhtml">
- *     <h1>About the XML namespace</h1>
- * 
- *     <div class="bodytext">
- *      <p>
- *       This schema document describes the XML namespace, in a form
- *       suitable for import by other schema documents.
- *      </p>
- *      <p>
- *       See <a href="http://www.w3.org/XML/1998/namespace.html">
- *       http://www.w3.org/XML/1998/namespace.html</a> and
- *       <a href="http://www.w3.org/TR/REC-xml">
- *       http://www.w3.org/TR/REC-xml</a> for information 
- *       about this namespace.
- *      </p>
- *      <p>
- *       Note that local names in this namespace are intended to be
- *       defined only by the World Wide Web Consortium or its subgroups.
- *       The names currently defined in this namespace are listed below.
- *       They should not be used with conflicting semantics by any Working
- *       Group, specification, or document instance.
- *      </p>
- *      <p>   
- *       See further below in this document for more information about <a href="#usage">how to refer to this schema document from your own
- *       XSD schema documents</a> and about <a href="#nsversioning">the
- *       namespace-versioning policy governing this schema document</a>.
- *      </p>
- *     </div>
- *    </div>
- *   
- * 
- *    <div xmlns="http://www.w3.org/1999/xhtml">
- *    
- *     <h3>Father (in any context at all)</h3> 
- * 
- *     <div class="bodytext">
- *      <p>
- *       denotes Jon Bosak, the chair of 
- *       the original XML Working Group.  This name is reserved by 
- *       the following decision of the W3C XML Plenary and 
- *       XML Coordination groups:
- *      </p>
- *      <blockquote>
- *        <p>
- * 	In appreciation for his vision, leadership and
- * 	dedication the W3C XML Plenary on this 10th day of
- * 	February, 2000, reserves for Jon Bosak in perpetuity
- * 	the XML name "xml:Father".
- *        </p>
- *      </blockquote>
- *     </div>
- *    </div>
- *   
- * 
- *    <div id="usage" xml:id="usage" xmlns="http://www.w3.org/1999/xhtml">
- *     <h2>
- *       <a name="usage">About this schema document</a>
- *     </h2>
- * 
- *     <div class="bodytext">
- *      <p>
- *       This schema defines attributes and an attribute group suitable
- *       for use by schemas wishing to allow <code>xml:base</code>,
- *       <code>xml:lang</code>, <code>xml:space</code> or
- *       <code>xml:id</code> attributes on elements they define.
- *      </p>
- *      <p>
- *       To enable this, such a schema must import this schema for
- *       the XML namespace, e.g. as follows:
- *      </p>
- *      <pre>
+ * <pre>
  *           &lt;schema . . .&gt;
  *            . . .
  *            &lt;import namespace="http://www.w3.org/XML/1998/namespace"
  *                       schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
- *      </pre>
- *      <p>
- *       or
- *      </p>
- *      <pre>
+ * </pre>
+ * <p>
+ * or
+ * </p>
+ * 
+ * <pre>
  *            &lt;import namespace="http://www.w3.org/XML/1998/namespace"
  *                       schemaLocation="http://www.w3.org/2009/01/xml.xsd"/&gt;
- *      </pre>
- *      <p>
- *       Subsequently, qualified reference to any of the attributes or the
- *       group defined below will have the desired effect, e.g.
- *      </p>
- *      <pre>
+ * </pre>
+ * <p>
+ * Subsequently, qualified reference to any of the attributes or the group defined below will have the desired effect,
+ * e.g.
+ * </p>
+ * 
+ * <pre>
  *           &lt;type . . .&gt;
  *            . . .
  *            &lt;attributeGroup ref="xml:specialAttrs"/&gt;
- *      </pre>
- *      <p>
- *       will define a type which will schema-validate an instance element
- *       with any of those attributes.
- *      </p>
- *     </div>
- *    </div>
- *   
- * 
- *    <div id="nsversioning" xml:id="nsversioning" xmlns="http://www.w3.org/1999/xhtml">
- *     <h2>
- *       <a name="nsversioning">Versioning policy for this schema document</a>
- *     </h2>
- *     <div class="bodytext">
- *      <p>
- *       In keeping with the XML Schema WG's standard versioning
- *       policy, this schema document will persist at
- *       <a href="http://www.w3.org/2009/01/xml.xsd">
- *        http://www.w3.org/2009/01/xml.xsd</a>.
- *      </p>
- *      <p>
- *       At the date of issue it can also be found at
- *       <a href="http://www.w3.org/2001/xml.xsd">
- *        http://www.w3.org/2001/xml.xsd</a>.
- *      </p>
- *      <p>
- *       The schema document at that URI may however change in the future,
- *       in order to remain compatible with the latest version of XML
- *       Schema itself, or with the XML namespace itself.  In other words,
- *       if the XML Schema or XML namespaces change, the version of this
- *       document at <a href="http://www.w3.org/2001/xml.xsd">
- *        http://www.w3.org/2001/xml.xsd 
- *       </a> 
- *       will change accordingly; the version at 
- *       <a href="http://www.w3.org/2009/01/xml.xsd">
- *        http://www.w3.org/2009/01/xml.xsd 
- *       </a> 
- *       will not change.
- *      </p>
- *      <p>
- *       Previous dated (and unchanging) versions of this schema 
- *       document are at:
- *      </p>
- *      <ul>
- *       <li>
- *           <a href="http://www.w3.org/2009/01/xml.xsd">
- * 	http://www.w3.org/2009/01/xml.xsd</a>
- *         </li>
- *       <li>
- *           <a href="http://www.w3.org/2007/08/xml.xsd">
- * 	http://www.w3.org/2007/08/xml.xsd</a>
- *         </li>
- *       <li>
- *           <a href="http://www.w3.org/2004/10/xml.xsd">
- * 	http://www.w3.org/2004/10/xml.xsd</a>
- *         </li>
- *       <li>
- *           <a href="http://www.w3.org/2001/03/xml.xsd">
- * 	http://www.w3.org/2001/03/xml.xsd</a>
- *         </li>
- *      </ul>
- *     </div>
- *    </div>
- *   
- * 
- *       Textual Content
- *       This is the XML Schema Text module for XHTML
- * 
- *       The Text module includes declarations for all core
- *       text container elements and their attributes.
- *     
- *         +  block phrasal
- *         +  block structural
- *         +  inline phrasal
- *         +  inline structural
- *       
- *       $Id: xhtml-text-1.xsd,v 1.1 2010/07/29 13:42:52 bertails Exp $
- *     
- * 
- * 
- * 
- *           This is the XML Schema Block Phrasal support module for XHTML
- *           $Id: xhtml-blkphras-1.xsd,v 1.1 2010/07/29 13:42:50 bertails Exp $
- *        
- * 
- * 
- *            Block Phrasal
- *            This module declares the elements and their attributes used to
- *            support block-level phrasal markup.
- *            This is the XML Schema block phrasal elements module for XHTML
- * 
- *             * address, blockquote, pre, h1, h2, h3, h4, h5, h6
- *       
- * 
- * 
- *           XHTML Datatypes
- *           This is the XML Schema datatypes module for XHTML
- *           
- *           Defines containers for the XHTML datatypes, many of
- *           these imported from other specifications and standards.
- *           
- *           $Id: xhtml-datatypes-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $
- *         
- * 
- * 
- * 
- *       Block Structural
- * 
- *         * div, p
- *   
- *       This module declares the elements and their attributes used to
- *       support block-level structural markup.            
- *           
- *       This is the XML Schema Block Structural module for XHTML
- *       $Id: xhtml-blkstruct-1.xsd,v 1.1 2010/07/29 13:42:50 bertails Exp $
- *     
- * 
- * 
- *          This is the XML Schema Inline Phrasal support module for XHTML
- *          $Id: xhtml-inlphras-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $
- *     
- * 
- * 
- *       Inline Phrasal.
- *       This module declares the elements and their attributes used to
- *       support inline-level phrasal markup.
- *       This is the XML Schema Inline Phrasal module for XHTML
- * 
- *         * abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
- * 
- *       $Id: xhtml-inlphras-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $
- *     
- * 
- * 
- *          This is the XML Schema Inline Structural support module for XHTML
- *          $Id: xhtml-inlstruct-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $
- *     
- * 
- * 
- *       Inline Structural.
- *       This module declares the elements and their attributes 
- *       used to support inline-level structural markup.      
- *       This is the XML Schema Inline Structural element module for XHTML
- * 
- *         * br, span
- *       
- *     
- * 
- * 
- *       Hypertext Module
- *       This is the XML Schema Hypertext module for XHTML
- *             
- *         * a
- *             
- *       This module declares the anchor ('a') element type, which
- *       defines the source of a hypertext link. The destination
- *       (or link 'target') is identified via its 'id' attribute 
- *       rather than the 'name' attribute as was used in HTML.
- * 
- *       $Id: xhtml-hypertext-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $
- *     
- * 
- * 
- * 
- *       List Module
- *       This is the XML Schema Lists module for XHTML
- *       List Module Elements
- *     
- *         * dl, dt, dd, ol, ul, li
- *     
- *       This module declares the list-oriented element types
- *       and their attributes.
- *       $Id: xhtml-list-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $      
- *     
- * 
- * 
- * 
- *           Editing Elements
- *           This is the XML Schema Editing Markup module for XHTML
- * 
- *            * ins, del
- *   
- *          This module declares element types and attributes used to indicate
- *          inserted and deleted content while editing a document.
- * 
- *           $Id: xhtml-edit-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $
- *         
- * 
- * 
- * 
- *       This is the XML Schema Presentation module for XHTML
- *       This is a REQUIRED module.
- *       $Id: xhtml-pres-1.xsd,v 1.1 2010/07/29 13:42:52 bertails Exp $
- *     
- * 
- * 
- *       Presentational Elements
- * 
- *       This module defines elements and their attributes for
- *       simple presentation-related markup.
- *  
- *       Elements defined here:
- * 
- *         * hr
- *         * b, big, i, small, sub, sup, tt
- *     
- * 
- * 
- *       This is the XML SchemaBlock presentation element module for XHTML
- *       $Id: xhtml-blkpres-1.xsd,v 1.1 2010/07/29 13:42:50 bertails Exp $
- *     
- * 
- *       Block Presentational Elements
- *   
- *         * hr
- *   
- *       This module declares the elements and their attributes used to
- *       support block-level presentational markup.
- *     
- * 
- * 
- * 
- *       This is the XML Schema Inline Presentation element module for XHTML
- *       $Id: xhtml-inlpres-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $
- *     
- * 
- * 
- *       Inline Presentational Elements
- *     
- *         * b, big, i, small, sub, sup, tt
- *     
- *       This module declares the elements and their attributes used to
- *       support inline-level presentational markup.
- *     
- * 
- * 
- *       Inline Style module    
- *       This is the XML Schema Inline Style module for XHTML
- *       
- *          * styloe attribute
- * 
- *       This module declares the 'style' attribute, used to support inline 
- *       style markup. 
- * 
- *       $Id: xhtml-inlstyle-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $
- *     
- * 
- * 
- * 
- *       This is the XML Schema Embedded Object module for XHTML
- *       $Id: xhtml-object-1.xsd,v 1.1 2010/07/29 13:42:52 bertails Exp $
- *     
- * 
- * 
- *       This module declares the object element type and its attributes,
- *       used to embed external objects as part of XHTML pages. In the
- *       document, place param elements prior to the object elements 
- *       that require their content.
- *           
- *       Note that use of this module requires instantiation of the 
- *       Param Element Module prior to this module.
- *       
- *       Elements defined here: 
- *       
- *         * object (param)
- *     
- * 
- * 
- *       This is the XML Schema Param Element module for XHTML
- *       $Id: xhtml-param-1.xsd,v 1.1 2010/07/29 13:42:52 bertails Exp $
- *       
- * 
- * 
- *       Parameters for Java Applets and Embedded Objects
- * 
- *         * param
- * 
- *       This module provides declarations for the param element,
- *       used to provide named property values for the applet
- *       and object elements.
- *     
- * 
- * 
- * 
- *           This is the XML Schema Tables module for XHTML
- *           $Id: xhtml-table-1.xsd,v 1.1 2010/07/29 13:42:52 bertails Exp $
- *         
- * 
- * 
- *           Tables
- *       
- *            * table, caption, thead, tfoot, tbody, colgroup, col, tr, th, td
- *       
- *           This module declares element types and attributes used to provide
- *           table markup similar to HTML 4.0, including features that enable
- *           better accessibility for non-visual user agents.
- *         
+ * </pre>
+ * <p>
+ * will define a type which will schema-validate an instance element with any of those attributes.
+ * </p>
+ * </div> </div> <div id="nsversioning" xml:id="nsversioning" xmlns="http://www.w3.org/1999/xhtml"> <h2><a
+ * name="nsversioning">Versioning policy for this schema document</a></h2> <div class="bodytext">
+ * <p>
+ * In keeping with the XML Schema WG's standard versioning policy, this schema document will persist at <a
+ * href="http://www.w3.org/2009/01/xml.xsd"> http://www.w3.org/2009/01/xml.xsd</a>.
+ * </p>
+ * <p>
+ * At the date of issue it can also be found at <a href="http://www.w3.org/2001/xml.xsd">
+ * http://www.w3.org/2001/xml.xsd</a>.
+ * </p>
+ * <p>
+ * The schema document at that URI may however change in the future, in order to remain compatible with the latest
+ * version of XML Schema itself, or with the XML namespace itself. In other words, if the XML Schema or XML namespaces
+ * change, the version of this document at <a href="http://www.w3.org/2001/xml.xsd"> http://www.w3.org/2001/xml.xsd </a>
+ * will change accordingly; the version at <a href="http://www.w3.org/2009/01/xml.xsd">
+ * http://www.w3.org/2009/01/xml.xsd </a> will not change.
+ * </p>
+ * <p>
+ * Previous dated (and unchanging) versions of this schema document are at:
+ * </p>
+ * <ul>
+ * <li><a href="http://www.w3.org/2009/01/xml.xsd"> http://www.w3.org/2009/01/xml.xsd</a></li>
+ * <li><a href="http://www.w3.org/2007/08/xml.xsd"> http://www.w3.org/2007/08/xml.xsd</a></li>
+ * <li><a href="http://www.w3.org/2004/10/xml.xsd"> http://www.w3.org/2004/10/xml.xsd</a></li>
+ * <li><a href="http://www.w3.org/2001/03/xml.xsd"> http://www.w3.org/2001/03/xml.xsd</a></li>
+ * </ul>
+ * </div> </div> Textual Content This is the XML Schema Text module for XHTML The Text module includes declarations for
+ * all core text container elements and their attributes. + block phrasal + block structural + inline phrasal + inline
+ * structural $Id: xhtml-text-1.xsd,v 1.1 2010/07/29 13:42:52 bertails Exp $ This is the XML Schema Block Phrasal
+ * support module for XHTML $Id: xhtml-blkphras-1.xsd,v 1.1 2010/07/29 13:42:50 bertails Exp $ Block Phrasal This module
+ * declares the elements and their attributes used to support block-level phrasal markup. This is the XML Schema block
+ * phrasal elements module for XHTML * address, blockquote, pre, h1, h2, h3, h4, h5, h6 XHTML Datatypes This is the XML
+ * Schema datatypes module for XHTML Defines containers for the XHTML datatypes, many of these imported from other
+ * specifications and standards. $Id: xhtml-datatypes-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $ Block Structural *
+ * div, p This module declares the elements and their attributes used to support block-level structural markup. This is
+ * the XML Schema Block Structural module for XHTML $Id: xhtml-blkstruct-1.xsd,v 1.1 2010/07/29 13:42:50 bertails Exp $
+ * This is the XML Schema Inline Phrasal support module for XHTML $Id: xhtml-inlphras-1.xsd,v 1.1 2010/07/29 13:42:51
+ * bertails Exp $ Inline Phrasal. This module declares the elements and their attributes used to support inline-level
+ * phrasal markup. This is the XML Schema Inline Phrasal module for XHTML * abbr, acronym, cite, code, dfn, em, kbd, q,
+ * samp, strong, var $Id: xhtml-inlphras-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $ This is the XML Schema Inline
+ * Structural support module for XHTML $Id: xhtml-inlstruct-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $ Inline
+ * Structural. This module declares the elements and their attributes used to support inline-level structural markup.
+ * This is the XML Schema Inline Structural element module for XHTML * br, span Hypertext Module This is the XML Schema
+ * Hypertext module for XHTML * a This module declares the anchor ('a') element type, which defines the source of a
+ * hypertext link. The destination (or link 'target') is identified via its 'id' attribute rather than the 'name'
+ * attribute as was used in HTML. $Id: xhtml-hypertext-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $ List Module This
+ * is the XML Schema Lists module for XHTML List Module Elements * dl, dt, dd, ol, ul, li This module declares the
+ * list-oriented element types and their attributes. $Id: xhtml-list-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $
+ * Editing Elements This is the XML Schema Editing Markup module for XHTML * ins, del This module declares element types
+ * and attributes used to indicate inserted and deleted content while editing a document. $Id: xhtml-edit-1.xsd,v 1.1
+ * 2010/07/29 13:42:51 bertails Exp $ This is the XML Schema Presentation module for XHTML This is a REQUIRED module.
+ * $Id: xhtml-pres-1.xsd,v 1.1 2010/07/29 13:42:52 bertails Exp $ Presentational Elements This module defines elements
+ * and their attributes for simple presentation-related markup. Elements defined here: * hr * b, big, i, small, sub,
+ * sup, tt This is the XML SchemaBlock presentation element module for XHTML $Id: xhtml-blkpres-1.xsd,v 1.1 2010/07/29
+ * 13:42:50 bertails Exp $ Block Presentational Elements * hr This module declares the elements and their attributes
+ * used to support block-level presentational markup. This is the XML Schema Inline Presentation element module for
+ * XHTML $Id: xhtml-inlpres-1.xsd,v 1.1 2010/07/29 13:42:51 bertails Exp $ Inline Presentational Elements * b, big, i,
+ * small, sub, sup, tt This module declares the elements and their attributes used to support inline-level
+ * presentational markup. Inline Style module This is the XML Schema Inline Style module for XHTML * styloe attribute
+ * This module declares the 'style' attribute, used to support inline style markup. $Id: xhtml-inlstyle-1.xsd,v 1.1
+ * 2010/07/29 13:42:51 bertails Exp $ This is the XML Schema Embedded Object module for XHTML $Id: xhtml-object-1.xsd,v
+ * 1.1 2010/07/29 13:42:52 bertails Exp $ This module declares the object element type and its attributes, used to embed
+ * external objects as part of XHTML pages. In the document, place param elements prior to the object elements that
+ * require their content. Note that use of this module requires instantiation of the Param Element Module prior to this
+ * module. Elements defined here: * object (param) This is the XML Schema Param Element module for XHTML $Id:
+ * xhtml-param-1.xsd,v 1.1 2010/07/29 13:42:52 bertails Exp $ Parameters for Java Applets and Embedded Objects * param
+ * This module provides declarations for the param element, used to provide named property values for the applet and
+ * object elements. This is the XML Schema Tables module for XHTML $Id: xhtml-table-1.xsd,v 1.1 2010/07/29 13:42:52
+ * bertails Exp $ Tables * table, caption, thead, tfoot, tbody, colgroup, col, tr, th, td This module declares element
+ * types and attributes used to provide table markup similar to HTML 4.0, including features that enable better
+ * accessibility for non-visual user agents. <!-- end-model-doc -->
  * 
- * <!-- end-model-doc -->
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlFactory
  * @model kind="package"
  * @generated
  */
 public interface XhtmlPackage extends EPackage {
 	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	String eNAME = "xhtml";
+	String eNAME = "xhtml"; //$NON-NLS-1$
 
 	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	String eNS_URI = "http://www.w3.org/1999/xhtml";
+	String eNS_URI = "http://www.w3.org/1999/xhtml"; //$NON-NLS-1$
 
 	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	String eNS_PREFIX = "xhtml";
+	String eNS_PREFIX = "xhtml"; //$NON-NLS-1$
 
 	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	XhtmlPackage eINSTANCE = org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl <em>Document Root</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl <em>Document Root</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getDocumentRoot()
 	 * @generated
@@ -492,90 +214,82 @@
 	int DOCUMENT_ROOT = 0;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENT_ROOT__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1;
 
 	/**
-	 * The feature id for the '<em><b>XSI Schema Location</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>XSI Schema Location</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2;
 
 	/**
-	 * The feature id for the '<em><b>Div</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Div</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENT_ROOT__DIV = 3;
 
 	/**
-	 * The feature id for the '<em><b>P</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>P</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENT_ROOT__P = 4;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENT_ROOT__CLASS = 5;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENT_ROOT__ID = 6;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENT_ROOT__TITLE = 7;
 
 	/**
-	 * The number of structural features of the '<em>Document Root</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Document Root</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENT_ROOT_FEATURE_COUNT = 8;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl <em>Abbr Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl <em>Abbr Type</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlAbbrType()
 	 * @generated
@@ -583,306 +297,299 @@
 	int XHTML_ABBR_TYPE = 1;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>Abbr Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Abbr Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ABBR_TYPE_FEATURE_COUNT = 32;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl <em>Acronym Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl <em>Acronym Type</em>}
+	 * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlAcronymType()
 	 * @generated
@@ -890,306 +597,299 @@
 	int XHTML_ACRONYM_TYPE = 2;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>Acronym Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Acronym Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ACRONYM_TYPE_FEATURE_COUNT = 32;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl <em>Address Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl <em>Address Type</em>}
+	 * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlAddressType()
 	 * @generated
@@ -1197,306 +897,299 @@
 	int XHTML_ADDRESS_TYPE = 3;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>Address Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Address Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ADDRESS_TYPE_FEATURE_COUNT = 32;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl <em>AType</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl <em>AType</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlAType()
 	 * @generated
@@ -1504,369 +1197,353 @@
 	int XHTML_ATYPE = 4;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inl No Anchor Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inl No Anchor Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__XHTML_INL_NO_ANCHOR_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__OBJECT = 22;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__INS = 23;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__DEL = 24;
 
 	/**
-	 * The feature id for the '<em><b>Accesskey</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Accesskey</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__ACCESSKEY = 25;
 
 	/**
-	 * The feature id for the '<em><b>Charset</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Charset</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__CHARSET = 26;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__CLASS = 27;
 
 	/**
-	 * The feature id for the '<em><b>Href</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Href</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__HREF = 28;
 
 	/**
-	 * The feature id for the '<em><b>Hreflang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hreflang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__HREFLANG = 29;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__ID = 30;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__LANG = 31;
 
 	/**
-	 * The feature id for the '<em><b>Rel</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Rel</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__REL = 32;
 
 	/**
-	 * The feature id for the '<em><b>Rev</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Rev</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__REV = 33;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__SPACE = 34;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__STYLE = 35;
 
 	/**
-	 * The feature id for the '<em><b>Tabindex</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tabindex</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__TABINDEX = 36;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__TITLE = 37;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE__TYPE = 38;
 
 	/**
-	 * The number of structural features of the '<em>AType</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>AType</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_ATYPE_FEATURE_COUNT = 39;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl <em>Blockquote Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl
+	 * <em>Blockquote Type</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlBlockquoteType()
 	 * @generated
@@ -1874,243 +1551,236 @@
 	int XHTML_BLOCKQUOTE_TYPE = 5;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Block Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Block Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__XHTML_BLOCK_MIX = 0;
 
 	/**
-	 * The feature id for the '<em><b>H1</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H1</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__H1 = 1;
 
 	/**
-	 * The feature id for the '<em><b>H2</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H2</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__H2 = 2;
 
 	/**
-	 * The feature id for the '<em><b>H3</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H3</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__H3 = 3;
 
 	/**
-	 * The feature id for the '<em><b>H4</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H4</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__H4 = 4;
 
 	/**
-	 * The feature id for the '<em><b>H5</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H5</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__H5 = 5;
 
 	/**
-	 * The feature id for the '<em><b>H6</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H6</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__H6 = 6;
 
 	/**
-	 * The feature id for the '<em><b>Ul</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ul</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__UL = 7;
 
 	/**
-	 * The feature id for the '<em><b>Ol</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ol</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__OL = 8;
 
 	/**
-	 * The feature id for the '<em><b>Dl</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dl</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__DL = 9;
 
 	/**
-	 * The feature id for the '<em><b>P</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>P</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__P = 10;
 
 	/**
-	 * The feature id for the '<em><b>Div</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Div</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__DIV = 11;
 
 	/**
-	 * The feature id for the '<em><b>Pre</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Pre</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__PRE = 12;
 
 	/**
-	 * The feature id for the '<em><b>Blockquote</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Blockquote</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__BLOCKQUOTE = 13;
 
 	/**
-	 * The feature id for the '<em><b>Address</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Address</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__ADDRESS = 14;
 
 	/**
-	 * The feature id for the '<em><b>Hr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hr</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__HR = 15;
 
 	/**
-	 * The feature id for the '<em><b>Table</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Table</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__TABLE = 16;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__INS = 17;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__DEL = 18;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__CITE = 19;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__CLASS = 20;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__ID = 21;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__LANG = 22;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__SPACE = 23;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__STYLE = 24;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BLOCKQUOTE_TYPE__TITLE = 25;
 
 	/**
-	 * The number of structural features of the '<em>Blockquote Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Blockquote Type</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2118,8 +1788,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBrTypeImpl <em>Br Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBrTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlBrType()
 	 * @generated
@@ -2127,54 +1797,49 @@
 	int XHTML_BR_TYPE = 6;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BR_TYPE__CLASS = 0;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BR_TYPE__ID = 1;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BR_TYPE__SPACE = 2;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BR_TYPE__TITLE = 3;
 
 	/**
-	 * The number of structural features of the '<em>Br Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Br Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_BR_TYPE_FEATURE_COUNT = 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl <em>Caption Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl <em>Caption Type</em>}
+	 * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlCaptionType()
 	 * @generated
@@ -2182,306 +1847,299 @@
 	int XHTML_CAPTION_TYPE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>Caption Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Caption Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CAPTION_TYPE_FEATURE_COUNT = 32;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl <em>Cite Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl <em>Cite Type</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlCiteType()
 	 * @generated
@@ -2489,306 +2147,299 @@
 	int XHTML_CITE_TYPE = 8;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>Cite Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Cite Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CITE_TYPE_FEATURE_COUNT = 32;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl <em>Code Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl <em>Code Type</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlCodeType()
 	 * @generated
@@ -2796,306 +2447,299 @@
 	int XHTML_CODE_TYPE = 9;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>Code Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Code Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CODE_TYPE_FEATURE_COUNT = 32;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl <em>Colgroup Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl
+	 * <em>Colgroup Type</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlColgroupType()
 	 * @generated
@@ -3103,126 +2747,114 @@
 	int XHTML_COLGROUP_TYPE = 10;
 
 	/**
-	 * The feature id for the '<em><b>Col</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Col</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COLGROUP_TYPE__COL = 0;
 
 	/**
-	 * The feature id for the '<em><b>Align</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Align</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COLGROUP_TYPE__ALIGN = 1;
 
 	/**
-	 * The feature id for the '<em><b>Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Char</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COLGROUP_TYPE__CHAR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Charoff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Charoff</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COLGROUP_TYPE__CHAROFF = 3;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COLGROUP_TYPE__CLASS = 4;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COLGROUP_TYPE__ID = 5;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COLGROUP_TYPE__LANG = 6;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COLGROUP_TYPE__SPACE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COLGROUP_TYPE__SPAN = 8;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COLGROUP_TYPE__STYLE = 9;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COLGROUP_TYPE__TITLE = 10;
 
 	/**
-	 * The feature id for the '<em><b>Valign</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Valign</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COLGROUP_TYPE__VALIGN = 11;
 
 	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Width</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COLGROUP_TYPE__WIDTH = 12;
 
 	/**
-	 * The number of structural features of the '<em>Colgroup Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Colgroup Type</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3230,8 +2862,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl <em>Col Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlColType()
 	 * @generated
@@ -3239,117 +2871,104 @@
 	int XHTML_COL_TYPE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Align</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Align</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COL_TYPE__ALIGN = 0;
 
 	/**
-	 * The feature id for the '<em><b>Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Char</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COL_TYPE__CHAR = 1;
 
 	/**
-	 * The feature id for the '<em><b>Charoff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Charoff</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COL_TYPE__CHAROFF = 2;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COL_TYPE__CLASS = 3;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COL_TYPE__ID = 4;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COL_TYPE__LANG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COL_TYPE__SPACE = 6;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COL_TYPE__SPAN = 7;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COL_TYPE__STYLE = 8;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COL_TYPE__TITLE = 9;
 
 	/**
-	 * The feature id for the '<em><b>Valign</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Valign</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COL_TYPE__VALIGN = 10;
 
 	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Width</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_COL_TYPE__WIDTH = 11;
 
 	/**
-	 * The number of structural features of the '<em>Col Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Col Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3357,8 +2976,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl <em>Dd Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlDdType()
 	 * @generated
@@ -3366,441 +2985,433 @@
 	int XHTML_DD_TYPE = 12;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Flow Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Flow Mix</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__XHTML_FLOW_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>H1</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H1</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__H1 = 2;
 
 	/**
-	 * The feature id for the '<em><b>H2</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H2</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__H2 = 3;
 
 	/**
-	 * The feature id for the '<em><b>H3</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H3</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__H3 = 4;
 
 	/**
-	 * The feature id for the '<em><b>H4</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H4</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__H4 = 5;
 
 	/**
-	 * The feature id for the '<em><b>H5</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H5</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__H5 = 6;
 
 	/**
-	 * The feature id for the '<em><b>H6</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H6</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__H6 = 7;
 
 	/**
-	 * The feature id for the '<em><b>Ul</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ul</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__UL = 8;
 
 	/**
-	 * The feature id for the '<em><b>Ol</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ol</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__OL = 9;
 
 	/**
-	 * The feature id for the '<em><b>Dl</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dl</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__DL = 10;
 
 	/**
-	 * The feature id for the '<em><b>P</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>P</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__P = 11;
 
 	/**
-	 * The feature id for the '<em><b>Div</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Div</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__DIV = 12;
 
 	/**
-	 * The feature id for the '<em><b>Pre</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Pre</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__PRE = 13;
 
 	/**
-	 * The feature id for the '<em><b>Blockquote</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Blockquote</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__BLOCKQUOTE = 14;
 
 	/**
-	 * The feature id for the '<em><b>Address</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Address</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__ADDRESS = 15;
 
 	/**
-	 * The feature id for the '<em><b>Hr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hr</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__HR = 16;
 
 	/**
-	 * The feature id for the '<em><b>Table</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Table</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__TABLE = 17;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__BR = 18;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__SPAN = 19;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__EM = 20;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__STRONG = 21;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__DFN = 22;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__CODE = 23;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__SAMP = 24;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__KBD = 25;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__VAR = 26;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__CITE = 27;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__ABBR = 28;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__ACRONYM = 29;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__Q = 30;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__TT = 31;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__I = 32;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__B = 33;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__BIG = 34;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__SMALL = 35;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__SUB = 36;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__SUP = 37;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__A = 38;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__OBJECT = 39;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__INS = 40;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__DEL = 41;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__CLASS = 42;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__ID = 43;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__LANG = 44;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__SPACE = 45;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__STYLE = 46;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DD_TYPE__TITLE = 47;
 
 	/**
-	 * The number of structural features of the '<em>Dd Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Dd Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3808,8 +3419,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl <em>Dfn Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlDfnType()
 	 * @generated
@@ -3817,297 +3428,289 @@
 	int XHTML_DFN_TYPE = 13;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DFN_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>Dfn Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Dfn Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4115,8 +3718,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl <em>Div Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlDivType()
 	 * @generated
@@ -4124,441 +3727,433 @@
 	int XHTML_DIV_TYPE = 14;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Flow Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Flow Mix</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__XHTML_FLOW_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>H1</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H1</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__H1 = 2;
 
 	/**
-	 * The feature id for the '<em><b>H2</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H2</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__H2 = 3;
 
 	/**
-	 * The feature id for the '<em><b>H3</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H3</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__H3 = 4;
 
 	/**
-	 * The feature id for the '<em><b>H4</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H4</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__H4 = 5;
 
 	/**
-	 * The feature id for the '<em><b>H5</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H5</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__H5 = 6;
 
 	/**
-	 * The feature id for the '<em><b>H6</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H6</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__H6 = 7;
 
 	/**
-	 * The feature id for the '<em><b>Ul</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ul</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__UL = 8;
 
 	/**
-	 * The feature id for the '<em><b>Ol</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ol</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__OL = 9;
 
 	/**
-	 * The feature id for the '<em><b>Dl</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dl</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__DL = 10;
 
 	/**
-	 * The feature id for the '<em><b>P</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>P</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__P = 11;
 
 	/**
-	 * The feature id for the '<em><b>Div</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Div</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__DIV = 12;
 
 	/**
-	 * The feature id for the '<em><b>Pre</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Pre</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__PRE = 13;
 
 	/**
-	 * The feature id for the '<em><b>Blockquote</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Blockquote</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__BLOCKQUOTE = 14;
 
 	/**
-	 * The feature id for the '<em><b>Address</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Address</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__ADDRESS = 15;
 
 	/**
-	 * The feature id for the '<em><b>Hr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hr</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__HR = 16;
 
 	/**
-	 * The feature id for the '<em><b>Table</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Table</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__TABLE = 17;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__BR = 18;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__SPAN = 19;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__EM = 20;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__STRONG = 21;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__DFN = 22;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__CODE = 23;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__SAMP = 24;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__KBD = 25;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__VAR = 26;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__CITE = 27;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__ABBR = 28;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__ACRONYM = 29;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__Q = 30;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__TT = 31;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__I = 32;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__B = 33;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__BIG = 34;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__SMALL = 35;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__SUB = 36;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__SUP = 37;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__A = 38;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__OBJECT = 39;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__INS = 40;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__DEL = 41;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__CLASS = 42;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__ID = 43;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__LANG = 44;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__SPACE = 45;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__STYLE = 46;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DIV_TYPE__TITLE = 47;
 
 	/**
-	 * The number of structural features of the '<em>Div Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Div Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4566,8 +4161,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl <em>Dl Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlDlType()
 	 * @generated
@@ -4575,90 +4170,82 @@
 	int XHTML_DL_TYPE = 15;
 
 	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Group</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DL_TYPE__GROUP = 0;
 
 	/**
-	 * The feature id for the '<em><b>Dt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DL_TYPE__DT = 1;
 
 	/**
-	 * The feature id for the '<em><b>Dd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dd</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DL_TYPE__DD = 2;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DL_TYPE__CLASS = 3;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DL_TYPE__ID = 4;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DL_TYPE__LANG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DL_TYPE__SPACE = 6;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DL_TYPE__STYLE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DL_TYPE__TITLE = 8;
 
 	/**
-	 * The number of structural features of the '<em>Dl Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Dl Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4666,8 +4253,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl <em>Dt Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlDtType()
 	 * @generated
@@ -4675,306 +4262,298 @@
 	int XHTML_DT_TYPE = 16;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>Dt Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Dt Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_DT_TYPE_FEATURE_COUNT = 32;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl <em>Edit Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl <em>Edit Type</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlEditType()
 	 * @generated
@@ -4982,459 +4561,450 @@
 	int XHTML_EDIT_TYPE = 17;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Flow Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Flow Mix</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__XHTML_FLOW_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>H1</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H1</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__H1 = 2;
 
 	/**
-	 * The feature id for the '<em><b>H2</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H2</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__H2 = 3;
 
 	/**
-	 * The feature id for the '<em><b>H3</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H3</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__H3 = 4;
 
 	/**
-	 * The feature id for the '<em><b>H4</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H4</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__H4 = 5;
 
 	/**
-	 * The feature id for the '<em><b>H5</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H5</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__H5 = 6;
 
 	/**
-	 * The feature id for the '<em><b>H6</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H6</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__H6 = 7;
 
 	/**
-	 * The feature id for the '<em><b>Ul</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ul</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__UL = 8;
 
 	/**
-	 * The feature id for the '<em><b>Ol</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ol</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__OL = 9;
 
 	/**
-	 * The feature id for the '<em><b>Dl</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dl</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__DL = 10;
 
 	/**
-	 * The feature id for the '<em><b>P</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>P</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__P = 11;
 
 	/**
-	 * The feature id for the '<em><b>Div</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Div</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__DIV = 12;
 
 	/**
-	 * The feature id for the '<em><b>Pre</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Pre</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__PRE = 13;
 
 	/**
-	 * The feature id for the '<em><b>Blockquote</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Blockquote</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__BLOCKQUOTE = 14;
 
 	/**
-	 * The feature id for the '<em><b>Address</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Address</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__ADDRESS = 15;
 
 	/**
-	 * The feature id for the '<em><b>Hr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hr</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__HR = 16;
 
 	/**
-	 * The feature id for the '<em><b>Table</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Table</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__TABLE = 17;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__BR = 18;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__SPAN = 19;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__EM = 20;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__STRONG = 21;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__DFN = 22;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__CODE = 23;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__SAMP = 24;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__KBD = 25;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__VAR = 26;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__CITE = 27;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__ABBR = 28;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__ACRONYM = 29;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__Q = 30;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__TT = 31;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__I = 32;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__B = 33;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__BIG = 34;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__SMALL = 35;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__SUB = 36;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__SUP = 37;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__A = 38;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__OBJECT = 39;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__INS = 40;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__DEL = 41;
 
 	/**
-	 * The feature id for the '<em><b>Cite1</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite1</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__CITE1 = 42;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__CLASS = 43;
 
 	/**
-	 * The feature id for the '<em><b>Datetime</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Datetime</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__DATETIME = 44;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__ID = 45;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__LANG = 46;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__SPACE = 47;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__STYLE = 48;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EDIT_TYPE__TITLE = 49;
 
 	/**
-	 * The number of structural features of the '<em>Edit Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Edit Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -5442,8 +5012,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl <em>Em Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlEmType()
 	 * @generated
@@ -5451,297 +5021,289 @@
 	int XHTML_EM_TYPE = 18;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_EM_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>Em Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Em Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -5749,8 +5311,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl <em>H1 Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlH1Type()
 	 * @generated
@@ -5758,297 +5320,289 @@
 	int XHTML_H1_TYPE = 19;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H1_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>H1 Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>H1 Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -6056,8 +5610,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl <em>H2 Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlH2Type()
 	 * @generated
@@ -6065,297 +5619,289 @@
 	int XHTML_H2_TYPE = 20;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H2_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>H2 Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>H2 Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -6363,8 +5909,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl <em>H3 Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlH3Type()
 	 * @generated
@@ -6372,297 +5918,289 @@
 	int XHTML_H3_TYPE = 21;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H3_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>H3 Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>H3 Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -6670,8 +6208,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl <em>H4 Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlH4Type()
 	 * @generated
@@ -6679,297 +6217,289 @@
 	int XHTML_H4_TYPE = 22;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H4_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>H4 Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>H4 Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -6977,8 +6507,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl <em>H5 Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlH5Type()
 	 * @generated
@@ -6986,297 +6516,289 @@
 	int XHTML_H5_TYPE = 23;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H5_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>H5 Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>H5 Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -7284,8 +6806,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl <em>H6 Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlH6Type()
 	 * @generated
@@ -7293,306 +6815,298 @@
 	int XHTML_H6_TYPE = 24;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>H6 Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>H6 Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_H6_TYPE_FEATURE_COUNT = 32;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl <em>Heading Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl <em>Heading Type</em>}
+	 * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlHeadingType()
 	 * @generated
@@ -7600,297 +7114,290 @@
 	int XHTML_HEADING_TYPE = 25;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HEADING_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>Heading Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Heading Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -7898,8 +7405,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHrTypeImpl <em>Hr Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHrTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlHrType()
 	 * @generated
@@ -7907,72 +7414,65 @@
 	int XHTML_HR_TYPE = 26;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HR_TYPE__CLASS = 0;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HR_TYPE__ID = 1;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HR_TYPE__LANG = 2;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HR_TYPE__SPACE = 3;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HR_TYPE__STYLE = 4;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HR_TYPE__TITLE = 5;
 
 	/**
-	 * The number of structural features of the '<em>Hr Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Hr Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_HR_TYPE_FEATURE_COUNT = 6;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl <em>Inl Pres Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl
+	 * <em>Inl Pres Type</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlInlPresType()
 	 * @generated
@@ -7980,297 +7480,290 @@
 	int XHTML_INL_PRES_TYPE = 27;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_INL_PRES_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>Inl Pres Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Inl Pres Type</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -8278,8 +7771,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl <em>Kbd Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlKbdType()
 	 * @generated
@@ -8287,297 +7780,289 @@
 	int XHTML_KBD_TYPE = 28;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_KBD_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>Kbd Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Kbd Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -8585,8 +8070,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl <em>Li Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlLiType()
 	 * @generated
@@ -8594,450 +8079,442 @@
 	int XHTML_LI_TYPE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Flow Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Flow Mix</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__XHTML_FLOW_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>H1</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H1</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__H1 = 2;
 
 	/**
-	 * The feature id for the '<em><b>H2</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H2</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__H2 = 3;
 
 	/**
-	 * The feature id for the '<em><b>H3</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H3</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__H3 = 4;
 
 	/**
-	 * The feature id for the '<em><b>H4</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H4</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__H4 = 5;
 
 	/**
-	 * The feature id for the '<em><b>H5</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H5</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__H5 = 6;
 
 	/**
-	 * The feature id for the '<em><b>H6</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H6</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__H6 = 7;
 
 	/**
-	 * The feature id for the '<em><b>Ul</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ul</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__UL = 8;
 
 	/**
-	 * The feature id for the '<em><b>Ol</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ol</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__OL = 9;
 
 	/**
-	 * The feature id for the '<em><b>Dl</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dl</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__DL = 10;
 
 	/**
-	 * The feature id for the '<em><b>P</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>P</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__P = 11;
 
 	/**
-	 * The feature id for the '<em><b>Div</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Div</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__DIV = 12;
 
 	/**
-	 * The feature id for the '<em><b>Pre</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Pre</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__PRE = 13;
 
 	/**
-	 * The feature id for the '<em><b>Blockquote</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Blockquote</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__BLOCKQUOTE = 14;
 
 	/**
-	 * The feature id for the '<em><b>Address</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Address</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__ADDRESS = 15;
 
 	/**
-	 * The feature id for the '<em><b>Hr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hr</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__HR = 16;
 
 	/**
-	 * The feature id for the '<em><b>Table</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Table</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__TABLE = 17;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__BR = 18;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__SPAN = 19;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__EM = 20;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__STRONG = 21;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__DFN = 22;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__CODE = 23;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__SAMP = 24;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__KBD = 25;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__VAR = 26;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__CITE = 27;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__ABBR = 28;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__ACRONYM = 29;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__Q = 30;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__TT = 31;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__I = 32;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__B = 33;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__BIG = 34;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__SMALL = 35;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__SUB = 36;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__SUP = 37;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__A = 38;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__OBJECT = 39;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__INS = 40;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__DEL = 41;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__CLASS = 42;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__ID = 43;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__LANG = 44;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__SPACE = 45;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__STYLE = 46;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE__TITLE = 47;
 
 	/**
-	 * The number of structural features of the '<em>Li Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Li Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_LI_TYPE_FEATURE_COUNT = 48;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl <em>Object Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl <em>Object Type</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlObjectType()
 	 * @generated
@@ -9045,558 +8522,538 @@
 	int XHTML_OBJECT_TYPE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Group</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__GROUP = 1;
 
 	/**
-	 * The feature id for the '<em><b>Param</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Param</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__PARAM = 2;
 
 	/**
-	 * The feature id for the '<em><b>H1</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H1</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__H1 = 3;
 
 	/**
-	 * The feature id for the '<em><b>H2</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H2</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__H2 = 4;
 
 	/**
-	 * The feature id for the '<em><b>H3</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H3</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__H3 = 5;
 
 	/**
-	 * The feature id for the '<em><b>H4</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H4</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__H4 = 6;
 
 	/**
-	 * The feature id for the '<em><b>H5</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H5</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__H5 = 7;
 
 	/**
-	 * The feature id for the '<em><b>H6</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H6</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__H6 = 8;
 
 	/**
-	 * The feature id for the '<em><b>Ul</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ul</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__UL = 9;
 
 	/**
-	 * The feature id for the '<em><b>Ol</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ol</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__OL = 10;
 
 	/**
-	 * The feature id for the '<em><b>Dl</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dl</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__DL = 11;
 
 	/**
-	 * The feature id for the '<em><b>P</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>P</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__P = 12;
 
 	/**
-	 * The feature id for the '<em><b>Div</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Div</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__DIV = 13;
 
 	/**
-	 * The feature id for the '<em><b>Pre</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Pre</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__PRE = 14;
 
 	/**
-	 * The feature id for the '<em><b>Blockquote</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Blockquote</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__BLOCKQUOTE = 15;
 
 	/**
-	 * The feature id for the '<em><b>Address</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Address</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__ADDRESS = 16;
 
 	/**
-	 * The feature id for the '<em><b>Hr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hr</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__HR = 17;
 
 	/**
-	 * The feature id for the '<em><b>Table</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Table</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__TABLE = 18;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__BR = 19;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__SPAN = 20;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__EM = 21;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__STRONG = 22;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__DFN = 23;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__CODE = 24;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__SAMP = 25;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__KBD = 26;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__VAR = 27;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__CITE = 28;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__ABBR = 29;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__ACRONYM = 30;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__Q = 31;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__TT = 32;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__I = 33;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__B = 34;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__BIG = 35;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__SMALL = 36;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__SUB = 37;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__SUP = 38;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__A = 39;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__OBJECT = 40;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__INS = 41;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__DEL = 42;
 
 	/**
-	 * The feature id for the '<em><b>Archive</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Archive</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__ARCHIVE = 43;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__CLASS = 44;
 
 	/**
-	 * The feature id for the '<em><b>Classid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Classid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__CLASSID = 45;
 
 	/**
-	 * The feature id for the '<em><b>Codebase</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Codebase</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__CODEBASE = 46;
 
 	/**
-	 * The feature id for the '<em><b>Codetype</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Codetype</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__CODETYPE = 47;
 
 	/**
-	 * The feature id for the '<em><b>Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Data</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__DATA = 48;
 
 	/**
-	 * The feature id for the '<em><b>Declare</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Declare</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__DECLARE = 49;
 
 	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Height</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__HEIGHT = 50;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__ID = 51;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__LANG = 52;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__NAME = 53;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__SPACE = 54;
 
 	/**
-	 * The feature id for the '<em><b>Standby</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Standby</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__STANDBY = 55;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__STYLE = 56;
 
 	/**
-	 * The feature id for the '<em><b>Tabindex</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tabindex</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__TABINDEX = 57;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__TITLE = 58;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__TYPE = 59;
 
 	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Width</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OBJECT_TYPE__WIDTH = 60;
 
 	/**
-	 * The number of structural features of the '<em>Object Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Object Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -9604,8 +9061,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlOlTypeImpl <em>Ol Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlOlTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlOlType()
 	 * @generated
@@ -9613,81 +9070,74 @@
 	int XHTML_OL_TYPE = 31;
 
 	/**
-	 * The feature id for the '<em><b>Li</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Li</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OL_TYPE__LI = 0;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OL_TYPE__CLASS = 1;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OL_TYPE__ID = 2;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OL_TYPE__LANG = 3;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OL_TYPE__SPACE = 4;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OL_TYPE__STYLE = 5;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OL_TYPE__TITLE = 6;
 
 	/**
-	 * The number of structural features of the '<em>Ol Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Ol Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_OL_TYPE_FEATURE_COUNT = 7;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlParamTypeImpl <em>Param Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlParamTypeImpl <em>Param Type</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlParamTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlParamType()
 	 * @generated
@@ -9695,54 +9145,49 @@
 	int XHTML_PARAM_TYPE = 32;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PARAM_TYPE__ID = 0;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PARAM_TYPE__NAME = 1;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PARAM_TYPE__TYPE = 2;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PARAM_TYPE__VALUE = 3;
 
 	/**
-	 * The feature id for the '<em><b>Valuetype</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Valuetype</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PARAM_TYPE__VALUETYPE = 4;
 
 	/**
-	 * The number of structural features of the '<em>Param Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Param Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -9750,8 +9195,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl <em>Pre Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlPreType()
 	 * @generated
@@ -9759,261 +9204,253 @@
 	int XHTML_PRE_TYPE = 33;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Pre Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Pre Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__XHTML_INLINE_PRE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__A = 18;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__INS = 19;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__DEL = 20;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__CLASS = 21;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__ID = 22;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__LANG = 23;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__SPACE = 24;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__STYLE = 25;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE__TITLE = 26;
 
 	/**
-	 * The number of structural features of the '<em>Pre Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Pre Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PRE_TYPE_FEATURE_COUNT = 27;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl <em>PType</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl <em>PType</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlPType()
 	 * @generated
@@ -10021,306 +9458,298 @@
 	int XHTML_PTYPE = 34;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>PType</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>PType</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_PTYPE_FEATURE_COUNT = 32;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl <em>QType</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl <em>QType</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlQType()
 	 * @generated
@@ -10328,315 +9757,306 @@
 	int XHTML_QTYPE = 35;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Cite1</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite1</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__CITE1 = 26;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__CLASS = 27;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__ID = 28;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__LANG = 29;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__SPACE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__STYLE = 31;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE__TITLE = 32;
 
 	/**
-	 * The number of structural features of the '<em>QType</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>QType</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_QTYPE_FEATURE_COUNT = 33;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl <em>Samp Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl <em>Samp Type</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlSampType()
 	 * @generated
@@ -10644,306 +10064,299 @@
 	int XHTML_SAMP_TYPE = 36;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>Samp Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Samp Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SAMP_TYPE_FEATURE_COUNT = 32;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl <em>Span Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl <em>Span Type</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlSpanType()
 	 * @generated
@@ -10951,306 +10364,299 @@
 	int XHTML_SPAN_TYPE = 37;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>Span Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Span Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_SPAN_TYPE_FEATURE_COUNT = 32;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl <em>Strong Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl <em>Strong Type</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlStrongType()
 	 * @generated
@@ -11258,306 +10664,299 @@
 	int XHTML_STRONG_TYPE = 38;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>Strong Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Strong Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_STRONG_TYPE_FEATURE_COUNT = 32;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl <em>Table Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl <em>Table Type</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlTableType()
 	 * @generated
@@ -11565,198 +10964,185 @@
 	int XHTML_TABLE_TYPE = 39;
 
 	/**
-	 * The feature id for the '<em><b>Caption</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Caption</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__CAPTION = 0;
 
 	/**
-	 * The feature id for the '<em><b>Col</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Col</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__COL = 1;
 
 	/**
-	 * The feature id for the '<em><b>Colgroup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Colgroup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__COLGROUP = 2;
 
 	/**
-	 * The feature id for the '<em><b>Thead</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Thead</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__THEAD = 3;
 
 	/**
-	 * The feature id for the '<em><b>Tfoot</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tfoot</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__TFOOT = 4;
 
 	/**
-	 * The feature id for the '<em><b>Tbody</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tbody</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__TBODY = 5;
 
 	/**
-	 * The feature id for the '<em><b>Tr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tr</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__TR = 6;
 
 	/**
-	 * The feature id for the '<em><b>Border</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Border</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__BORDER = 7;
 
 	/**
-	 * The feature id for the '<em><b>Cellpadding</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cellpadding</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__CELLPADDING = 8;
 
 	/**
-	 * The feature id for the '<em><b>Cellspacing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cellspacing</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__CELLSPACING = 9;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__CLASS = 10;
 
 	/**
-	 * The feature id for the '<em><b>Frame</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Frame</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__FRAME = 11;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__ID = 12;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__LANG = 13;
 
 	/**
-	 * The feature id for the '<em><b>Rules</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Rules</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__RULES = 14;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__SPACE = 15;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__STYLE = 16;
 
 	/**
-	 * The feature id for the '<em><b>Summary</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Summary</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__SUMMARY = 17;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__TITLE = 18;
 
 	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Width</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE__WIDTH = 19;
 
 	/**
-	 * The number of structural features of the '<em>Table Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Table Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TABLE_TYPE_FEATURE_COUNT = 20;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl <em>Tbody Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl <em>Tbody Type</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlTbodyType()
 	 * @generated
@@ -11764,108 +11150,98 @@
 	int XHTML_TBODY_TYPE = 40;
 
 	/**
-	 * The feature id for the '<em><b>Tr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tr</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TBODY_TYPE__TR = 0;
 
 	/**
-	 * The feature id for the '<em><b>Align</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Align</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TBODY_TYPE__ALIGN = 1;
 
 	/**
-	 * The feature id for the '<em><b>Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Char</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TBODY_TYPE__CHAR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Charoff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Charoff</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TBODY_TYPE__CHAROFF = 3;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TBODY_TYPE__CLASS = 4;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TBODY_TYPE__ID = 5;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TBODY_TYPE__LANG = 6;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TBODY_TYPE__SPACE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TBODY_TYPE__STYLE = 8;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TBODY_TYPE__TITLE = 9;
 
 	/**
-	 * The feature id for the '<em><b>Valign</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Valign</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TBODY_TYPE__VALIGN = 10;
 
 	/**
-	 * The number of structural features of the '<em>Tbody Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Tbody Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -11873,8 +11249,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl <em>Td Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlTdType()
 	 * @generated
@@ -11882,540 +11258,522 @@
 	int XHTML_TD_TYPE = 41;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Flow Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Flow Mix</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__XHTML_FLOW_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>H1</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H1</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__H1 = 2;
 
 	/**
-	 * The feature id for the '<em><b>H2</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H2</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__H2 = 3;
 
 	/**
-	 * The feature id for the '<em><b>H3</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H3</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__H3 = 4;
 
 	/**
-	 * The feature id for the '<em><b>H4</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H4</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__H4 = 5;
 
 	/**
-	 * The feature id for the '<em><b>H5</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H5</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__H5 = 6;
 
 	/**
-	 * The feature id for the '<em><b>H6</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H6</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__H6 = 7;
 
 	/**
-	 * The feature id for the '<em><b>Ul</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ul</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__UL = 8;
 
 	/**
-	 * The feature id for the '<em><b>Ol</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ol</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__OL = 9;
 
 	/**
-	 * The feature id for the '<em><b>Dl</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dl</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__DL = 10;
 
 	/**
-	 * The feature id for the '<em><b>P</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>P</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__P = 11;
 
 	/**
-	 * The feature id for the '<em><b>Div</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Div</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__DIV = 12;
 
 	/**
-	 * The feature id for the '<em><b>Pre</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Pre</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__PRE = 13;
 
 	/**
-	 * The feature id for the '<em><b>Blockquote</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Blockquote</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__BLOCKQUOTE = 14;
 
 	/**
-	 * The feature id for the '<em><b>Address</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Address</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__ADDRESS = 15;
 
 	/**
-	 * The feature id for the '<em><b>Hr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hr</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__HR = 16;
 
 	/**
-	 * The feature id for the '<em><b>Table</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Table</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__TABLE = 17;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__BR = 18;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__SPAN = 19;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__EM = 20;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__STRONG = 21;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__DFN = 22;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__CODE = 23;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__SAMP = 24;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__KBD = 25;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__VAR = 26;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__CITE = 27;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__ABBR = 28;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__ACRONYM = 29;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__Q = 30;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__TT = 31;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__I = 32;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__B = 33;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__BIG = 34;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__SMALL = 35;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__SUB = 36;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__SUP = 37;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__A = 38;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__OBJECT = 39;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__INS = 40;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__DEL = 41;
 
 	/**
-	 * The feature id for the '<em><b>Abbr1</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr1</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__ABBR1 = 42;
 
 	/**
-	 * The feature id for the '<em><b>Align</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Align</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__ALIGN = 43;
 
 	/**
-	 * The feature id for the '<em><b>Axis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Axis</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__AXIS = 44;
 
 	/**
-	 * The feature id for the '<em><b>Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Char</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__CHAR = 45;
 
 	/**
-	 * The feature id for the '<em><b>Charoff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Charoff</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__CHAROFF = 46;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__CLASS = 47;
 
 	/**
-	 * The feature id for the '<em><b>Colspan</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Colspan</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__COLSPAN = 48;
 
 	/**
-	 * The feature id for the '<em><b>Headers</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Headers</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__HEADERS = 49;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__ID = 50;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__LANG = 51;
 
 	/**
-	 * The feature id for the '<em><b>Rowspan</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Rowspan</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__ROWSPAN = 52;
 
 	/**
-	 * The feature id for the '<em><b>Scope</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Scope</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__SCOPE = 53;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__SPACE = 54;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__STYLE = 55;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__TITLE = 56;
 
 	/**
-	 * The feature id for the '<em><b>Valign</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Valign</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE__VALIGN = 57;
 
 	/**
-	 * The number of structural features of the '<em>Td Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Td Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TD_TYPE_FEATURE_COUNT = 58;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl <em>Tfoot Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl <em>Tfoot Type</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlTfootType()
 	 * @generated
@@ -12423,117 +11781,107 @@
 	int XHTML_TFOOT_TYPE = 42;
 
 	/**
-	 * The feature id for the '<em><b>Tr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tr</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TFOOT_TYPE__TR = 0;
 
 	/**
-	 * The feature id for the '<em><b>Align</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Align</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TFOOT_TYPE__ALIGN = 1;
 
 	/**
-	 * The feature id for the '<em><b>Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Char</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TFOOT_TYPE__CHAR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Charoff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Charoff</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TFOOT_TYPE__CHAROFF = 3;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TFOOT_TYPE__CLASS = 4;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TFOOT_TYPE__ID = 5;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TFOOT_TYPE__LANG = 6;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TFOOT_TYPE__SPACE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TFOOT_TYPE__STYLE = 8;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TFOOT_TYPE__TITLE = 9;
 
 	/**
-	 * The feature id for the '<em><b>Valign</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Valign</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TFOOT_TYPE__VALIGN = 10;
 
 	/**
-	 * The number of structural features of the '<em>Tfoot Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Tfoot Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TFOOT_TYPE_FEATURE_COUNT = 11;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl <em>Thead Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl <em>Thead Type</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlTheadType()
 	 * @generated
@@ -12541,108 +11889,98 @@
 	int XHTML_THEAD_TYPE = 43;
 
 	/**
-	 * The feature id for the '<em><b>Tr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tr</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_THEAD_TYPE__TR = 0;
 
 	/**
-	 * The feature id for the '<em><b>Align</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Align</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_THEAD_TYPE__ALIGN = 1;
 
 	/**
-	 * The feature id for the '<em><b>Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Char</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_THEAD_TYPE__CHAR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Charoff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Charoff</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_THEAD_TYPE__CHAROFF = 3;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_THEAD_TYPE__CLASS = 4;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_THEAD_TYPE__ID = 5;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_THEAD_TYPE__LANG = 6;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_THEAD_TYPE__SPACE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_THEAD_TYPE__STYLE = 8;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_THEAD_TYPE__TITLE = 9;
 
 	/**
-	 * The feature id for the '<em><b>Valign</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Valign</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_THEAD_TYPE__VALIGN = 10;
 
 	/**
-	 * The number of structural features of the '<em>Thead Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Thead Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -12650,8 +11988,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl <em>Th Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlThType()
 	 * @generated
@@ -12659,531 +11997,513 @@
 	int XHTML_TH_TYPE = 44;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Flow Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Flow Mix</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__XHTML_FLOW_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>H1</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H1</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__H1 = 2;
 
 	/**
-	 * The feature id for the '<em><b>H2</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H2</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__H2 = 3;
 
 	/**
-	 * The feature id for the '<em><b>H3</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H3</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__H3 = 4;
 
 	/**
-	 * The feature id for the '<em><b>H4</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H4</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__H4 = 5;
 
 	/**
-	 * The feature id for the '<em><b>H5</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H5</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__H5 = 6;
 
 	/**
-	 * The feature id for the '<em><b>H6</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>H6</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__H6 = 7;
 
 	/**
-	 * The feature id for the '<em><b>Ul</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ul</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__UL = 8;
 
 	/**
-	 * The feature id for the '<em><b>Ol</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ol</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__OL = 9;
 
 	/**
-	 * The feature id for the '<em><b>Dl</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dl</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__DL = 10;
 
 	/**
-	 * The feature id for the '<em><b>P</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>P</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__P = 11;
 
 	/**
-	 * The feature id for the '<em><b>Div</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Div</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__DIV = 12;
 
 	/**
-	 * The feature id for the '<em><b>Pre</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Pre</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__PRE = 13;
 
 	/**
-	 * The feature id for the '<em><b>Blockquote</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Blockquote</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__BLOCKQUOTE = 14;
 
 	/**
-	 * The feature id for the '<em><b>Address</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Address</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__ADDRESS = 15;
 
 	/**
-	 * The feature id for the '<em><b>Hr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hr</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__HR = 16;
 
 	/**
-	 * The feature id for the '<em><b>Table</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Table</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__TABLE = 17;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__BR = 18;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__SPAN = 19;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__EM = 20;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__STRONG = 21;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__DFN = 22;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__CODE = 23;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__SAMP = 24;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__KBD = 25;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__VAR = 26;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__CITE = 27;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__ABBR = 28;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__ACRONYM = 29;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__Q = 30;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__TT = 31;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__I = 32;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__B = 33;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__BIG = 34;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__SMALL = 35;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__SUB = 36;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__SUP = 37;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__A = 38;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__OBJECT = 39;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__INS = 40;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__DEL = 41;
 
 	/**
-	 * The feature id for the '<em><b>Abbr1</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr1</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__ABBR1 = 42;
 
 	/**
-	 * The feature id for the '<em><b>Align</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Align</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__ALIGN = 43;
 
 	/**
-	 * The feature id for the '<em><b>Axis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Axis</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__AXIS = 44;
 
 	/**
-	 * The feature id for the '<em><b>Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Char</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__CHAR = 45;
 
 	/**
-	 * The feature id for the '<em><b>Charoff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Charoff</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__CHAROFF = 46;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__CLASS = 47;
 
 	/**
-	 * The feature id for the '<em><b>Colspan</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Colspan</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__COLSPAN = 48;
 
 	/**
-	 * The feature id for the '<em><b>Headers</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Headers</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__HEADERS = 49;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__ID = 50;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__LANG = 51;
 
 	/**
-	 * The feature id for the '<em><b>Rowspan</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Rowspan</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__ROWSPAN = 52;
 
 	/**
-	 * The feature id for the '<em><b>Scope</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Scope</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__SCOPE = 53;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__SPACE = 54;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__STYLE = 55;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__TITLE = 56;
 
 	/**
-	 * The feature id for the '<em><b>Valign</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Valign</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TH_TYPE__VALIGN = 57;
 
 	/**
-	 * The number of structural features of the '<em>Th Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Th Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -13191,8 +12511,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl <em>Tr Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlTrType()
 	 * @generated
@@ -13200,126 +12520,114 @@
 	int XHTML_TR_TYPE = 45;
 
 	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Group</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TR_TYPE__GROUP = 0;
 
 	/**
-	 * The feature id for the '<em><b>Th</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Th</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TR_TYPE__TH = 1;
 
 	/**
-	 * The feature id for the '<em><b>Td</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Td</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TR_TYPE__TD = 2;
 
 	/**
-	 * The feature id for the '<em><b>Align</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Align</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TR_TYPE__ALIGN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Char</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TR_TYPE__CHAR = 4;
 
 	/**
-	 * The feature id for the '<em><b>Charoff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Charoff</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TR_TYPE__CHAROFF = 5;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TR_TYPE__CLASS = 6;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TR_TYPE__ID = 7;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TR_TYPE__LANG = 8;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TR_TYPE__SPACE = 9;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TR_TYPE__STYLE = 10;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TR_TYPE__TITLE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Valign</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Valign</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_TR_TYPE__VALIGN = 12;
 
 	/**
-	 * The number of structural features of the '<em>Tr Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Tr Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -13327,8 +12635,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlUlTypeImpl <em>Ul Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlUlTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlUlType()
 	 * @generated
@@ -13336,72 +12644,65 @@
 	int XHTML_UL_TYPE = 46;
 
 	/**
-	 * The feature id for the '<em><b>Li</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Li</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_UL_TYPE__LI = 0;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_UL_TYPE__CLASS = 1;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_UL_TYPE__ID = 2;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_UL_TYPE__LANG = 3;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_UL_TYPE__SPACE = 4;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_UL_TYPE__STYLE = 5;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_UL_TYPE__TITLE = 6;
 
 	/**
-	 * The number of structural features of the '<em>Ul Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Ul Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -13409,8 +12710,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl <em>Var Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getXhtmlVarType()
 	 * @generated
@@ -13418,306 +12719,298 @@
 	int XHTML_VAR_TYPE = 47;
 
 	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__MIXED = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Inline Mix</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__XHTML_INLINE_MIX = 1;
 
 	/**
-	 * The feature id for the '<em><b>Br</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Br</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__BR = 2;
 
 	/**
-	 * The feature id for the '<em><b>Span</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Span</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__SPAN = 3;
 
 	/**
-	 * The feature id for the '<em><b>Em</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Em</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__EM = 4;
 
 	/**
-	 * The feature id for the '<em><b>Strong</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strong</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__STRONG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dfn</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__DFN = 6;
 
 	/**
-	 * The feature id for the '<em><b>Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Code</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__CODE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Samp</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Samp</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__SAMP = 8;
 
 	/**
-	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Kbd</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__KBD = 9;
 
 	/**
-	 * The feature id for the '<em><b>Var</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Var</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__VAR = 10;
 
 	/**
-	 * The feature id for the '<em><b>Cite</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Cite</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__CITE = 11;
 
 	/**
-	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Abbr</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__ABBR = 12;
 
 	/**
-	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Acronym</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__ACRONYM = 13;
 
 	/**
-	 * The feature id for the '<em><b>Q</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Q</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__Q = 14;
 
 	/**
-	 * The feature id for the '<em><b>Tt</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tt</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__TT = 15;
 
 	/**
-	 * The feature id for the '<em><b>I</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>I</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__I = 16;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>B</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__B = 17;
 
 	/**
-	 * The feature id for the '<em><b>Big</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Big</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__BIG = 18;
 
 	/**
-	 * The feature id for the '<em><b>Small</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Small</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__SMALL = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sub</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sub</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__SUB = 20;
 
 	/**
-	 * The feature id for the '<em><b>Sup</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sup</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__SUP = 21;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>A</b></em>' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__A = 22;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__OBJECT = 23;
 
 	/**
-	 * The feature id for the '<em><b>Ins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__INS = 24;
 
 	/**
-	 * The feature id for the '<em><b>Del</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Del</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__DEL = 25;
 
 	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__CLASS = 26;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__ID = 27;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__LANG = 28;
 
 	/**
-	 * The feature id for the '<em><b>Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Space</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__SPACE = 29;
 
 	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE__TITLE = 31;
 
 	/**
-	 * The number of structural features of the '<em>Var Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Var Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_VAR_TYPE_FEATURE_COUNT = 32;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.AlignType <em>Align Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.AlignType <em>Align Type</em>}' enum. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getAlignType()
 	 * @generated
@@ -13725,9 +13018,9 @@
 	int ALIGN_TYPE = 48;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.DeclareType <em>Declare Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.DeclareType <em>Declare Type</em>}' enum. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.DeclareType
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getDeclareType()
 	 * @generated
@@ -13735,9 +13028,9 @@
 	int DECLARE_TYPE = 49;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.FrameType <em>Frame Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.FrameType <em>Frame Type</em>}' enum. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.FrameType
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getFrameType()
 	 * @generated
@@ -13745,9 +13038,9 @@
 	int FRAME_TYPE = 50;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.RulesType <em>Rules Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.RulesType <em>Rules Type</em>}' enum. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.RulesType
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getRulesType()
 	 * @generated
@@ -13755,9 +13048,9 @@
 	int RULES_TYPE = 51;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.ScopeType <em>Scope Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.ScopeType <em>Scope Type</em>}' enum. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.ScopeType
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getScopeType()
 	 * @generated
@@ -13765,9 +13058,9 @@
 	int SCOPE_TYPE = 52;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.ValignType <em>Valign Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.ValignType <em>Valign Type</em>}' enum. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getValignType()
 	 * @generated
@@ -13776,8 +13069,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.xhtml.ValuetypeType <em>Valuetype Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValuetypeType
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getValuetypeType()
 	 * @generated
@@ -13785,9 +13078,8 @@
 	int VALUETYPE_TYPE = 54;
 
 	/**
-	 * The meta object id for the '<em>Align Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Align Type Object</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getAlignTypeObject()
 	 * @generated
@@ -13795,9 +13087,9 @@
 	int ALIGN_TYPE_OBJECT = 55;
 
 	/**
-	 * The meta object id for the '<em>Declare Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Declare Type Object</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.DeclareType
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getDeclareTypeObject()
 	 * @generated
@@ -13805,9 +13097,8 @@
 	int DECLARE_TYPE_OBJECT = 56;
 
 	/**
-	 * The meta object id for the '<em>Frame Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Frame Type Object</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.FrameType
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getFrameTypeObject()
 	 * @generated
@@ -13815,9 +13106,8 @@
 	int FRAME_TYPE_OBJECT = 57;
 
 	/**
-	 * The meta object id for the '<em>Rules Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Rules Type Object</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.RulesType
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getRulesTypeObject()
 	 * @generated
@@ -13825,9 +13115,8 @@
 	int RULES_TYPE_OBJECT = 58;
 
 	/**
-	 * The meta object id for the '<em>Scope Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Scope Type Object</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.ScopeType
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getScopeTypeObject()
 	 * @generated
@@ -13835,9 +13124,8 @@
 	int SCOPE_TYPE_OBJECT = 59;
 
 	/**
-	 * The meta object id for the '<em>Valign Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Valign Type Object</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getValignTypeObject()
 	 * @generated
@@ -13845,20 +13133,19 @@
 	int VALIGN_TYPE_OBJECT = 60;
 
 	/**
-	 * The meta object id for the '<em>Valuetype Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Valuetype Type Object</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValuetypeType
 	 * @see org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPackageImpl#getValuetypeTypeObject()
 	 * @generated
 	 */
 	int VALUETYPE_TYPE_OBJECT = 61;
 
-
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot <em>Document Root</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Document Root</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.DocumentRoot
 	 * @generated
@@ -13866,9 +13153,9 @@
 	EClass getDocumentRoot();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getMixed()
 	 * @see #getDocumentRoot()
@@ -13877,9 +13164,9 @@
 	EAttribute getDocumentRoot_Mixed();
 
 	/**
-	 * Returns the meta object for the map '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the map '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getXMLNSPrefixMap
+	 * <em>XMLNS Prefix Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getXMLNSPrefixMap()
 	 * @see #getDocumentRoot()
@@ -13888,9 +13175,9 @@
 	EReference getDocumentRoot_XMLNSPrefixMap();
 
 	/**
-	 * Returns the meta object for the map '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the map '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getXSISchemaLocation
+	 * <em>XSI Schema Location</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the map '<em>XSI Schema Location</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getXSISchemaLocation()
 	 * @see #getDocumentRoot()
@@ -13899,9 +13186,9 @@
 	EReference getDocumentRoot_XSISchemaLocation();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getDiv <em>Div</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getDiv
+	 * <em>Div</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Div</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getDiv()
 	 * @see #getDocumentRoot()
@@ -13910,9 +13197,9 @@
 	EReference getDocumentRoot_Div();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getP <em>P</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getP
+	 * <em>P</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>P</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getP()
 	 * @see #getDocumentRoot()
@@ -13921,9 +13208,9 @@
 	EReference getDocumentRoot_P();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getClass_()
 	 * @see #getDocumentRoot()
@@ -13933,8 +13220,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getId()
 	 * @see #getDocumentRoot()
@@ -13943,9 +13230,9 @@
 	EAttribute getDocumentRoot_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.DocumentRoot#getTitle()
 	 * @see #getDocumentRoot()
@@ -13954,9 +13241,9 @@
 	EAttribute getDocumentRoot_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType <em>Abbr Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType <em>Abbr Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Abbr Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType
 	 * @generated
@@ -13964,9 +13251,9 @@
 	EClass getXhtmlAbbrType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getMixed()
 	 * @see #getXhtmlAbbrType()
@@ -13975,9 +13262,10 @@
 	EAttribute getXhtmlAbbrType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getXhtmlInlineMix()
 	 * @see #getXhtmlAbbrType()
@@ -13986,9 +13274,10 @@
 	EAttribute getXhtmlAbbrType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getBr()
 	 * @see #getXhtmlAbbrType()
@@ -13997,9 +13286,10 @@
 	EReference getXhtmlAbbrType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSpan()
 	 * @see #getXhtmlAbbrType()
@@ -14008,9 +13298,10 @@
 	EReference getXhtmlAbbrType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getEm()
 	 * @see #getXhtmlAbbrType()
@@ -14019,9 +13310,10 @@
 	EReference getXhtmlAbbrType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getStrong()
 	 * @see #getXhtmlAbbrType()
@@ -14030,9 +13322,10 @@
 	EReference getXhtmlAbbrType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getDfn()
 	 * @see #getXhtmlAbbrType()
@@ -14041,9 +13334,10 @@
 	EReference getXhtmlAbbrType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getCode()
 	 * @see #getXhtmlAbbrType()
@@ -14052,9 +13346,10 @@
 	EReference getXhtmlAbbrType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSamp()
 	 * @see #getXhtmlAbbrType()
@@ -14063,9 +13358,10 @@
 	EReference getXhtmlAbbrType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getKbd()
 	 * @see #getXhtmlAbbrType()
@@ -14074,9 +13370,10 @@
 	EReference getXhtmlAbbrType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getVar()
 	 * @see #getXhtmlAbbrType()
@@ -14085,9 +13382,10 @@
 	EReference getXhtmlAbbrType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getCite()
 	 * @see #getXhtmlAbbrType()
@@ -14096,9 +13394,10 @@
 	EReference getXhtmlAbbrType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getAbbr()
 	 * @see #getXhtmlAbbrType()
@@ -14107,9 +13406,10 @@
 	EReference getXhtmlAbbrType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getAcronym()
 	 * @see #getXhtmlAbbrType()
@@ -14118,9 +13418,10 @@
 	EReference getXhtmlAbbrType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getQ()
 	 * @see #getXhtmlAbbrType()
@@ -14129,9 +13430,10 @@
 	EReference getXhtmlAbbrType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getTt()
 	 * @see #getXhtmlAbbrType()
@@ -14140,9 +13442,10 @@
 	EReference getXhtmlAbbrType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getI()
 	 * @see #getXhtmlAbbrType()
@@ -14151,9 +13454,10 @@
 	EReference getXhtmlAbbrType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getB()
 	 * @see #getXhtmlAbbrType()
@@ -14162,9 +13466,10 @@
 	EReference getXhtmlAbbrType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getBig()
 	 * @see #getXhtmlAbbrType()
@@ -14173,9 +13478,10 @@
 	EReference getXhtmlAbbrType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSmall()
 	 * @see #getXhtmlAbbrType()
@@ -14184,9 +13490,10 @@
 	EReference getXhtmlAbbrType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSub()
 	 * @see #getXhtmlAbbrType()
@@ -14195,9 +13502,10 @@
 	EReference getXhtmlAbbrType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSup()
 	 * @see #getXhtmlAbbrType()
@@ -14206,9 +13514,10 @@
 	EReference getXhtmlAbbrType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getA()
 	 * @see #getXhtmlAbbrType()
@@ -14217,9 +13526,10 @@
 	EReference getXhtmlAbbrType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getObject()
 	 * @see #getXhtmlAbbrType()
@@ -14228,9 +13538,10 @@
 	EReference getXhtmlAbbrType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getIns()
 	 * @see #getXhtmlAbbrType()
@@ -14239,9 +13550,10 @@
 	EReference getXhtmlAbbrType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getDel()
 	 * @see #getXhtmlAbbrType()
@@ -14250,9 +13562,9 @@
 	EReference getXhtmlAbbrType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getClass_()
 	 * @see #getXhtmlAbbrType()
@@ -14261,9 +13573,9 @@
 	EAttribute getXhtmlAbbrType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getId <em>Id</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getId()
 	 * @see #getXhtmlAbbrType()
@@ -14272,9 +13584,9 @@
 	EAttribute getXhtmlAbbrType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getLang()
 	 * @see #getXhtmlAbbrType()
@@ -14283,9 +13595,9 @@
 	EAttribute getXhtmlAbbrType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getSpace()
 	 * @see #getXhtmlAbbrType()
@@ -14294,9 +13606,9 @@
 	EAttribute getXhtmlAbbrType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getStyle()
 	 * @see #getXhtmlAbbrType()
@@ -14305,9 +13617,9 @@
 	EAttribute getXhtmlAbbrType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType#getTitle()
 	 * @see #getXhtmlAbbrType()
@@ -14317,8 +13629,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType <em>Acronym Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Acronym Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType
 	 * @generated
@@ -14326,9 +13638,9 @@
 	EClass getXhtmlAcronymType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getMixed()
 	 * @see #getXhtmlAcronymType()
@@ -14337,9 +13649,10 @@
 	EAttribute getXhtmlAcronymType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getXhtmlInlineMix()
 	 * @see #getXhtmlAcronymType()
@@ -14348,9 +13661,10 @@
 	EAttribute getXhtmlAcronymType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getBr()
 	 * @see #getXhtmlAcronymType()
@@ -14359,9 +13673,10 @@
 	EReference getXhtmlAcronymType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSpan()
 	 * @see #getXhtmlAcronymType()
@@ -14370,9 +13685,10 @@
 	EReference getXhtmlAcronymType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getEm()
 	 * @see #getXhtmlAcronymType()
@@ -14381,9 +13697,10 @@
 	EReference getXhtmlAcronymType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getStrong()
 	 * @see #getXhtmlAcronymType()
@@ -14392,9 +13709,10 @@
 	EReference getXhtmlAcronymType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getDfn()
 	 * @see #getXhtmlAcronymType()
@@ -14403,9 +13721,10 @@
 	EReference getXhtmlAcronymType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getCode()
 	 * @see #getXhtmlAcronymType()
@@ -14414,9 +13733,10 @@
 	EReference getXhtmlAcronymType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSamp()
 	 * @see #getXhtmlAcronymType()
@@ -14425,9 +13745,10 @@
 	EReference getXhtmlAcronymType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getKbd()
 	 * @see #getXhtmlAcronymType()
@@ -14436,9 +13757,10 @@
 	EReference getXhtmlAcronymType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getVar()
 	 * @see #getXhtmlAcronymType()
@@ -14447,9 +13769,10 @@
 	EReference getXhtmlAcronymType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getCite()
 	 * @see #getXhtmlAcronymType()
@@ -14458,9 +13781,10 @@
 	EReference getXhtmlAcronymType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getAbbr()
 	 * @see #getXhtmlAcronymType()
@@ -14469,9 +13793,10 @@
 	EReference getXhtmlAcronymType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getAcronym()
 	 * @see #getXhtmlAcronymType()
@@ -14480,9 +13805,10 @@
 	EReference getXhtmlAcronymType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getQ()
 	 * @see #getXhtmlAcronymType()
@@ -14491,9 +13817,10 @@
 	EReference getXhtmlAcronymType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getTt()
 	 * @see #getXhtmlAcronymType()
@@ -14502,9 +13829,10 @@
 	EReference getXhtmlAcronymType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getI <em>I</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getI()
 	 * @see #getXhtmlAcronymType()
@@ -14513,9 +13841,10 @@
 	EReference getXhtmlAcronymType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getB <em>B</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getB()
 	 * @see #getXhtmlAcronymType()
@@ -14524,9 +13853,10 @@
 	EReference getXhtmlAcronymType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getBig()
 	 * @see #getXhtmlAcronymType()
@@ -14535,9 +13865,10 @@
 	EReference getXhtmlAcronymType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSmall()
 	 * @see #getXhtmlAcronymType()
@@ -14546,9 +13877,10 @@
 	EReference getXhtmlAcronymType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSub()
 	 * @see #getXhtmlAcronymType()
@@ -14557,9 +13889,10 @@
 	EReference getXhtmlAcronymType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSup()
 	 * @see #getXhtmlAcronymType()
@@ -14568,9 +13901,10 @@
 	EReference getXhtmlAcronymType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getA <em>A</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getA()
 	 * @see #getXhtmlAcronymType()
@@ -14579,9 +13913,10 @@
 	EReference getXhtmlAcronymType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getObject()
 	 * @see #getXhtmlAcronymType()
@@ -14590,9 +13925,10 @@
 	EReference getXhtmlAcronymType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getIns()
 	 * @see #getXhtmlAcronymType()
@@ -14601,9 +13937,10 @@
 	EReference getXhtmlAcronymType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getDel()
 	 * @see #getXhtmlAcronymType()
@@ -14612,9 +13949,9 @@
 	EReference getXhtmlAcronymType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getClass_()
 	 * @see #getXhtmlAcronymType()
@@ -14623,9 +13960,9 @@
 	EAttribute getXhtmlAcronymType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getId
+	 * <em>Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getId()
 	 * @see #getXhtmlAcronymType()
@@ -14634,9 +13971,9 @@
 	EAttribute getXhtmlAcronymType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getLang()
 	 * @see #getXhtmlAcronymType()
@@ -14645,9 +13982,9 @@
 	EAttribute getXhtmlAcronymType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getSpace()
 	 * @see #getXhtmlAcronymType()
@@ -14656,9 +13993,9 @@
 	EAttribute getXhtmlAcronymType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getStyle()
 	 * @see #getXhtmlAcronymType()
@@ -14667,9 +14004,9 @@
 	EAttribute getXhtmlAcronymType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType#getTitle()
 	 * @see #getXhtmlAcronymType()
@@ -14679,8 +14016,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType <em>Address Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Address Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType
 	 * @generated
@@ -14688,9 +14025,9 @@
 	EClass getXhtmlAddressType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getMixed()
 	 * @see #getXhtmlAddressType()
@@ -14699,9 +14036,10 @@
 	EAttribute getXhtmlAddressType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getXhtmlInlineMix()
 	 * @see #getXhtmlAddressType()
@@ -14710,9 +14048,10 @@
 	EAttribute getXhtmlAddressType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getBr()
 	 * @see #getXhtmlAddressType()
@@ -14721,9 +14060,10 @@
 	EReference getXhtmlAddressType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSpan()
 	 * @see #getXhtmlAddressType()
@@ -14732,9 +14072,10 @@
 	EReference getXhtmlAddressType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getEm()
 	 * @see #getXhtmlAddressType()
@@ -14743,9 +14084,10 @@
 	EReference getXhtmlAddressType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getStrong()
 	 * @see #getXhtmlAddressType()
@@ -14754,9 +14096,10 @@
 	EReference getXhtmlAddressType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getDfn()
 	 * @see #getXhtmlAddressType()
@@ -14765,9 +14108,10 @@
 	EReference getXhtmlAddressType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getCode()
 	 * @see #getXhtmlAddressType()
@@ -14776,9 +14120,10 @@
 	EReference getXhtmlAddressType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSamp()
 	 * @see #getXhtmlAddressType()
@@ -14787,9 +14132,10 @@
 	EReference getXhtmlAddressType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getKbd()
 	 * @see #getXhtmlAddressType()
@@ -14798,9 +14144,10 @@
 	EReference getXhtmlAddressType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getVar()
 	 * @see #getXhtmlAddressType()
@@ -14809,9 +14156,10 @@
 	EReference getXhtmlAddressType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getCite()
 	 * @see #getXhtmlAddressType()
@@ -14820,9 +14168,10 @@
 	EReference getXhtmlAddressType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getAbbr()
 	 * @see #getXhtmlAddressType()
@@ -14831,9 +14180,10 @@
 	EReference getXhtmlAddressType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getAcronym()
 	 * @see #getXhtmlAddressType()
@@ -14842,9 +14192,10 @@
 	EReference getXhtmlAddressType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getQ()
 	 * @see #getXhtmlAddressType()
@@ -14853,9 +14204,10 @@
 	EReference getXhtmlAddressType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getTt()
 	 * @see #getXhtmlAddressType()
@@ -14864,9 +14216,10 @@
 	EReference getXhtmlAddressType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getI <em>I</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getI()
 	 * @see #getXhtmlAddressType()
@@ -14875,9 +14228,10 @@
 	EReference getXhtmlAddressType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getB <em>B</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getB()
 	 * @see #getXhtmlAddressType()
@@ -14886,9 +14240,10 @@
 	EReference getXhtmlAddressType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getBig()
 	 * @see #getXhtmlAddressType()
@@ -14897,9 +14252,10 @@
 	EReference getXhtmlAddressType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSmall()
 	 * @see #getXhtmlAddressType()
@@ -14908,9 +14264,10 @@
 	EReference getXhtmlAddressType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSub()
 	 * @see #getXhtmlAddressType()
@@ -14919,9 +14276,10 @@
 	EReference getXhtmlAddressType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSup()
 	 * @see #getXhtmlAddressType()
@@ -14930,9 +14288,10 @@
 	EReference getXhtmlAddressType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getA <em>A</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getA()
 	 * @see #getXhtmlAddressType()
@@ -14941,9 +14300,10 @@
 	EReference getXhtmlAddressType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getObject()
 	 * @see #getXhtmlAddressType()
@@ -14952,9 +14312,10 @@
 	EReference getXhtmlAddressType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getIns()
 	 * @see #getXhtmlAddressType()
@@ -14963,9 +14324,10 @@
 	EReference getXhtmlAddressType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getDel()
 	 * @see #getXhtmlAddressType()
@@ -14974,9 +14336,9 @@
 	EReference getXhtmlAddressType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getClass_()
 	 * @see #getXhtmlAddressType()
@@ -14985,9 +14347,9 @@
 	EAttribute getXhtmlAddressType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getId
+	 * <em>Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getId()
 	 * @see #getXhtmlAddressType()
@@ -14996,9 +14358,9 @@
 	EAttribute getXhtmlAddressType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getLang()
 	 * @see #getXhtmlAddressType()
@@ -15007,9 +14369,9 @@
 	EAttribute getXhtmlAddressType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getSpace()
 	 * @see #getXhtmlAddressType()
@@ -15018,9 +14380,9 @@
 	EAttribute getXhtmlAddressType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getStyle()
 	 * @see #getXhtmlAddressType()
@@ -15029,9 +14391,9 @@
 	EAttribute getXhtmlAddressType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType#getTitle()
 	 * @see #getXhtmlAddressType()
@@ -15040,9 +14402,9 @@
 	EAttribute getXhtmlAddressType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType <em>AType</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType <em>AType</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>AType</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType
 	 * @generated
@@ -15050,9 +14412,9 @@
 	EClass getXhtmlAType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getMixed()
 	 * @see #getXhtmlAType()
@@ -15061,9 +14423,10 @@
 	EAttribute getXhtmlAType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getXhtmlInlNoAnchorMix <em>Xhtml Inl No Anchor Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getXhtmlInlNoAnchorMix <em>Xhtml Inl No Anchor Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inl No Anchor Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getXhtmlInlNoAnchorMix()
 	 * @see #getXhtmlAType()
@@ -15072,9 +14435,10 @@
 	EAttribute getXhtmlAType_XhtmlInlNoAnchorMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getBr()
 	 * @see #getXhtmlAType()
@@ -15083,9 +14447,10 @@
 	EReference getXhtmlAType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSpan()
 	 * @see #getXhtmlAType()
@@ -15094,9 +14459,10 @@
 	EReference getXhtmlAType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getEm()
 	 * @see #getXhtmlAType()
@@ -15105,9 +14471,10 @@
 	EReference getXhtmlAType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getStrong()
 	 * @see #getXhtmlAType()
@@ -15116,9 +14483,10 @@
 	EReference getXhtmlAType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getDfn()
 	 * @see #getXhtmlAType()
@@ -15127,9 +14495,10 @@
 	EReference getXhtmlAType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getCode()
 	 * @see #getXhtmlAType()
@@ -15138,9 +14507,10 @@
 	EReference getXhtmlAType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSamp()
 	 * @see #getXhtmlAType()
@@ -15149,9 +14519,10 @@
 	EReference getXhtmlAType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getKbd()
 	 * @see #getXhtmlAType()
@@ -15160,9 +14531,10 @@
 	EReference getXhtmlAType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getVar()
 	 * @see #getXhtmlAType()
@@ -15171,9 +14543,10 @@
 	EReference getXhtmlAType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getCite()
 	 * @see #getXhtmlAType()
@@ -15182,9 +14555,10 @@
 	EReference getXhtmlAType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAbbr()
 	 * @see #getXhtmlAType()
@@ -15193,9 +14567,10 @@
 	EReference getXhtmlAType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAcronym()
 	 * @see #getXhtmlAType()
@@ -15204,9 +14579,9 @@
 	EReference getXhtmlAType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getQ
+	 * <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getQ()
 	 * @see #getXhtmlAType()
@@ -15215,9 +14590,10 @@
 	EReference getXhtmlAType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTt()
 	 * @see #getXhtmlAType()
@@ -15226,9 +14602,9 @@
 	EReference getXhtmlAType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getI
+	 * <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getI()
 	 * @see #getXhtmlAType()
@@ -15237,9 +14613,9 @@
 	EReference getXhtmlAType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getB
+	 * <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getB()
 	 * @see #getXhtmlAType()
@@ -15248,9 +14624,10 @@
 	EReference getXhtmlAType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getBig()
 	 * @see #getXhtmlAType()
@@ -15259,9 +14636,10 @@
 	EReference getXhtmlAType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSmall()
 	 * @see #getXhtmlAType()
@@ -15270,9 +14648,10 @@
 	EReference getXhtmlAType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSub()
 	 * @see #getXhtmlAType()
@@ -15281,9 +14660,10 @@
 	EReference getXhtmlAType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSup()
 	 * @see #getXhtmlAType()
@@ -15292,9 +14672,10 @@
 	EReference getXhtmlAType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getObject()
 	 * @see #getXhtmlAType()
@@ -15303,9 +14684,10 @@
 	EReference getXhtmlAType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getIns()
 	 * @see #getXhtmlAType()
@@ -15314,9 +14696,10 @@
 	EReference getXhtmlAType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getDel()
 	 * @see #getXhtmlAType()
@@ -15325,9 +14708,9 @@
 	EReference getXhtmlAType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAccesskey <em>Accesskey</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAccesskey
+	 * <em>Accesskey</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Accesskey</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getAccesskey()
 	 * @see #getXhtmlAType()
@@ -15336,9 +14719,9 @@
 	EAttribute getXhtmlAType_Accesskey();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getCharset <em>Charset</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getCharset
+	 * <em>Charset</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Charset</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getCharset()
 	 * @see #getXhtmlAType()
@@ -15347,9 +14730,9 @@
 	EAttribute getXhtmlAType_Charset();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getClass_()
 	 * @see #getXhtmlAType()
@@ -15358,9 +14741,9 @@
 	EAttribute getXhtmlAType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getHref <em>Href</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getHref <em>Href</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Href</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getHref()
 	 * @see #getXhtmlAType()
@@ -15369,9 +14752,9 @@
 	EAttribute getXhtmlAType_Href();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getHreflang <em>Hreflang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getHreflang
+	 * <em>Hreflang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Hreflang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getHreflang()
 	 * @see #getXhtmlAType()
@@ -15381,8 +14764,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getId()
 	 * @see #getXhtmlAType()
@@ -15391,9 +14774,9 @@
 	EAttribute getXhtmlAType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getLang <em>Lang</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getLang()
 	 * @see #getXhtmlAType()
@@ -15403,8 +14786,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getRel <em>Rel</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Rel</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getRel()
 	 * @see #getXhtmlAType()
@@ -15414,8 +14797,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getRev <em>Rev</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Rev</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getRev()
 	 * @see #getXhtmlAType()
@@ -15424,9 +14807,9 @@
 	EAttribute getXhtmlAType_Rev();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getSpace()
 	 * @see #getXhtmlAType()
@@ -15435,9 +14818,9 @@
 	EAttribute getXhtmlAType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getStyle()
 	 * @see #getXhtmlAType()
@@ -15446,9 +14829,9 @@
 	EAttribute getXhtmlAType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTabindex <em>Tabindex</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTabindex
+	 * <em>Tabindex</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Tabindex</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTabindex()
 	 * @see #getXhtmlAType()
@@ -15457,9 +14840,9 @@
 	EAttribute getXhtmlAType_Tabindex();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getTitle()
 	 * @see #getXhtmlAType()
@@ -15468,9 +14851,9 @@
 	EAttribute getXhtmlAType_Title();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getType <em>Type</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType#getType()
 	 * @see #getXhtmlAType()
@@ -15479,9 +14862,9 @@
 	EAttribute getXhtmlAType_Type();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType <em>Blockquote Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType
+	 * <em>Blockquote Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Blockquote Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType
 	 * @generated
@@ -15489,9 +14872,10 @@
 	EClass getXhtmlBlockquoteType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getXhtmlBlockMix <em>Xhtml Block Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getXhtmlBlockMix <em>Xhtml Block Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Block Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getXhtmlBlockMix()
 	 * @see #getXhtmlBlockquoteType()
@@ -15500,9 +14884,10 @@
 	EAttribute getXhtmlBlockquoteType_XhtmlBlockMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH1 <em>H1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH1 <em>H1</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H1</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH1()
 	 * @see #getXhtmlBlockquoteType()
@@ -15511,9 +14896,10 @@
 	EReference getXhtmlBlockquoteType_H1();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH2 <em>H2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH2 <em>H2</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H2</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH2()
 	 * @see #getXhtmlBlockquoteType()
@@ -15522,9 +14908,10 @@
 	EReference getXhtmlBlockquoteType_H2();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH3 <em>H3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH3 <em>H3</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H3</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH3()
 	 * @see #getXhtmlBlockquoteType()
@@ -15533,9 +14920,10 @@
 	EReference getXhtmlBlockquoteType_H3();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH4 <em>H4</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH4 <em>H4</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H4</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH4()
 	 * @see #getXhtmlBlockquoteType()
@@ -15544,9 +14932,10 @@
 	EReference getXhtmlBlockquoteType_H4();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH5 <em>H5</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH5 <em>H5</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H5</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH5()
 	 * @see #getXhtmlBlockquoteType()
@@ -15555,9 +14944,10 @@
 	EReference getXhtmlBlockquoteType_H5();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH6 <em>H6</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH6 <em>H6</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H6</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getH6()
 	 * @see #getXhtmlBlockquoteType()
@@ -15566,9 +14956,10 @@
 	EReference getXhtmlBlockquoteType_H6();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getUl <em>Ul</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getUl <em>Ul</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ul</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getUl()
 	 * @see #getXhtmlBlockquoteType()
@@ -15577,9 +14968,10 @@
 	EReference getXhtmlBlockquoteType_Ul();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getOl <em>Ol</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getOl <em>Ol</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ol</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getOl()
 	 * @see #getXhtmlBlockquoteType()
@@ -15588,9 +14980,10 @@
 	EReference getXhtmlBlockquoteType_Ol();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getDl <em>Dl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getDl <em>Dl</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dl</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getDl()
 	 * @see #getXhtmlBlockquoteType()
@@ -15599,9 +14992,10 @@
 	EReference getXhtmlBlockquoteType_Dl();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getP <em>P</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getP <em>P</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>P</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getP()
 	 * @see #getXhtmlBlockquoteType()
@@ -15610,9 +15004,10 @@
 	EReference getXhtmlBlockquoteType_P();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getDiv <em>Div</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getDiv <em>Div</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Div</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getDiv()
 	 * @see #getXhtmlBlockquoteType()
@@ -15621,9 +15016,10 @@
 	EReference getXhtmlBlockquoteType_Div();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getPre <em>Pre</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getPre <em>Pre</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Pre</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getPre()
 	 * @see #getXhtmlBlockquoteType()
@@ -15632,9 +15028,10 @@
 	EReference getXhtmlBlockquoteType_Pre();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getBlockquote <em>Blockquote</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getBlockquote <em>Blockquote</em>}'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Blockquote</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getBlockquote()
 	 * @see #getXhtmlBlockquoteType()
@@ -15643,9 +15040,10 @@
 	EReference getXhtmlBlockquoteType_Blockquote();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getAddress <em>Address</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getAddress <em>Address</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Address</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getAddress()
 	 * @see #getXhtmlBlockquoteType()
@@ -15654,9 +15052,10 @@
 	EReference getXhtmlBlockquoteType_Address();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getHr <em>Hr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getHr <em>Hr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Hr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getHr()
 	 * @see #getXhtmlBlockquoteType()
@@ -15665,9 +15064,10 @@
 	EReference getXhtmlBlockquoteType_Hr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getTable <em>Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getTable <em>Table</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Table</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getTable()
 	 * @see #getXhtmlBlockquoteType()
@@ -15676,9 +15076,10 @@
 	EReference getXhtmlBlockquoteType_Table();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getIns()
 	 * @see #getXhtmlBlockquoteType()
@@ -15687,9 +15088,10 @@
 	EReference getXhtmlBlockquoteType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getDel()
 	 * @see #getXhtmlBlockquoteType()
@@ -15698,9 +15100,9 @@
 	EReference getXhtmlBlockquoteType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getCite
+	 * <em>Cite</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getCite()
 	 * @see #getXhtmlBlockquoteType()
@@ -15709,9 +15111,9 @@
 	EAttribute getXhtmlBlockquoteType_Cite();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getClass_()
 	 * @see #getXhtmlBlockquoteType()
@@ -15720,9 +15122,9 @@
 	EAttribute getXhtmlBlockquoteType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getId
+	 * <em>Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getId()
 	 * @see #getXhtmlBlockquoteType()
@@ -15731,9 +15133,9 @@
 	EAttribute getXhtmlBlockquoteType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getLang()
 	 * @see #getXhtmlBlockquoteType()
@@ -15742,9 +15144,9 @@
 	EAttribute getXhtmlBlockquoteType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getSpace()
 	 * @see #getXhtmlBlockquoteType()
@@ -15753,9 +15155,9 @@
 	EAttribute getXhtmlBlockquoteType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getStyle()
 	 * @see #getXhtmlBlockquoteType()
@@ -15764,9 +15166,9 @@
 	EAttribute getXhtmlBlockquoteType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType#getTitle()
 	 * @see #getXhtmlBlockquoteType()
@@ -15775,9 +15177,9 @@
 	EAttribute getXhtmlBlockquoteType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType <em>Br Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType <em>Br Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Br Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBrType
 	 * @generated
@@ -15785,9 +15187,9 @@
 	EClass getXhtmlBrType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getClass_()
 	 * @see #getXhtmlBrType()
@@ -15797,8 +15199,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getId()
 	 * @see #getXhtmlBrType()
@@ -15807,9 +15209,9 @@
 	EAttribute getXhtmlBrType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getSpace()
 	 * @see #getXhtmlBrType()
@@ -15818,9 +15220,9 @@
 	EAttribute getXhtmlBrType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBrType#getTitle()
 	 * @see #getXhtmlBrType()
@@ -15830,8 +15232,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType <em>Caption Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Caption Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType
 	 * @generated
@@ -15839,9 +15241,9 @@
 	EClass getXhtmlCaptionType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getMixed()
 	 * @see #getXhtmlCaptionType()
@@ -15850,9 +15252,10 @@
 	EAttribute getXhtmlCaptionType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getXhtmlInlineMix()
 	 * @see #getXhtmlCaptionType()
@@ -15861,9 +15264,10 @@
 	EAttribute getXhtmlCaptionType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getBr()
 	 * @see #getXhtmlCaptionType()
@@ -15872,9 +15276,10 @@
 	EReference getXhtmlCaptionType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSpan()
 	 * @see #getXhtmlCaptionType()
@@ -15883,9 +15288,10 @@
 	EReference getXhtmlCaptionType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getEm()
 	 * @see #getXhtmlCaptionType()
@@ -15894,9 +15300,10 @@
 	EReference getXhtmlCaptionType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getStrong()
 	 * @see #getXhtmlCaptionType()
@@ -15905,9 +15312,10 @@
 	EReference getXhtmlCaptionType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getDfn()
 	 * @see #getXhtmlCaptionType()
@@ -15916,9 +15324,10 @@
 	EReference getXhtmlCaptionType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getCode()
 	 * @see #getXhtmlCaptionType()
@@ -15927,9 +15336,10 @@
 	EReference getXhtmlCaptionType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSamp()
 	 * @see #getXhtmlCaptionType()
@@ -15938,9 +15348,10 @@
 	EReference getXhtmlCaptionType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getKbd()
 	 * @see #getXhtmlCaptionType()
@@ -15949,9 +15360,10 @@
 	EReference getXhtmlCaptionType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getVar()
 	 * @see #getXhtmlCaptionType()
@@ -15960,9 +15372,10 @@
 	EReference getXhtmlCaptionType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getCite()
 	 * @see #getXhtmlCaptionType()
@@ -15971,9 +15384,10 @@
 	EReference getXhtmlCaptionType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getAbbr()
 	 * @see #getXhtmlCaptionType()
@@ -15982,9 +15396,10 @@
 	EReference getXhtmlCaptionType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getAcronym()
 	 * @see #getXhtmlCaptionType()
@@ -15993,9 +15408,10 @@
 	EReference getXhtmlCaptionType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getQ()
 	 * @see #getXhtmlCaptionType()
@@ -16004,9 +15420,10 @@
 	EReference getXhtmlCaptionType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getTt()
 	 * @see #getXhtmlCaptionType()
@@ -16015,9 +15432,10 @@
 	EReference getXhtmlCaptionType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getI <em>I</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getI()
 	 * @see #getXhtmlCaptionType()
@@ -16026,9 +15444,10 @@
 	EReference getXhtmlCaptionType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getB <em>B</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getB()
 	 * @see #getXhtmlCaptionType()
@@ -16037,9 +15456,10 @@
 	EReference getXhtmlCaptionType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getBig()
 	 * @see #getXhtmlCaptionType()
@@ -16048,9 +15468,10 @@
 	EReference getXhtmlCaptionType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSmall()
 	 * @see #getXhtmlCaptionType()
@@ -16059,9 +15480,10 @@
 	EReference getXhtmlCaptionType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSub()
 	 * @see #getXhtmlCaptionType()
@@ -16070,9 +15492,10 @@
 	EReference getXhtmlCaptionType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSup()
 	 * @see #getXhtmlCaptionType()
@@ -16081,9 +15504,10 @@
 	EReference getXhtmlCaptionType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getA <em>A</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getA()
 	 * @see #getXhtmlCaptionType()
@@ -16092,9 +15516,10 @@
 	EReference getXhtmlCaptionType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getObject()
 	 * @see #getXhtmlCaptionType()
@@ -16103,9 +15528,10 @@
 	EReference getXhtmlCaptionType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getIns()
 	 * @see #getXhtmlCaptionType()
@@ -16114,9 +15540,10 @@
 	EReference getXhtmlCaptionType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getDel()
 	 * @see #getXhtmlCaptionType()
@@ -16125,9 +15552,9 @@
 	EReference getXhtmlCaptionType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getClass_()
 	 * @see #getXhtmlCaptionType()
@@ -16136,9 +15563,9 @@
 	EAttribute getXhtmlCaptionType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getId
+	 * <em>Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getId()
 	 * @see #getXhtmlCaptionType()
@@ -16147,9 +15574,9 @@
 	EAttribute getXhtmlCaptionType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getLang()
 	 * @see #getXhtmlCaptionType()
@@ -16158,9 +15585,9 @@
 	EAttribute getXhtmlCaptionType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getSpace()
 	 * @see #getXhtmlCaptionType()
@@ -16169,9 +15596,9 @@
 	EAttribute getXhtmlCaptionType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getStyle()
 	 * @see #getXhtmlCaptionType()
@@ -16180,9 +15607,9 @@
 	EAttribute getXhtmlCaptionType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType#getTitle()
 	 * @see #getXhtmlCaptionType()
@@ -16191,9 +15618,9 @@
 	EAttribute getXhtmlCaptionType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType <em>Cite Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType <em>Cite Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Cite Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType
 	 * @generated
@@ -16201,9 +15628,9 @@
 	EClass getXhtmlCiteType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getMixed()
 	 * @see #getXhtmlCiteType()
@@ -16212,9 +15639,10 @@
 	EAttribute getXhtmlCiteType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getXhtmlInlineMix()
 	 * @see #getXhtmlCiteType()
@@ -16223,9 +15651,10 @@
 	EAttribute getXhtmlCiteType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getBr()
 	 * @see #getXhtmlCiteType()
@@ -16234,9 +15663,10 @@
 	EReference getXhtmlCiteType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSpan()
 	 * @see #getXhtmlCiteType()
@@ -16245,9 +15675,10 @@
 	EReference getXhtmlCiteType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getEm()
 	 * @see #getXhtmlCiteType()
@@ -16256,9 +15687,10 @@
 	EReference getXhtmlCiteType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getStrong()
 	 * @see #getXhtmlCiteType()
@@ -16267,9 +15699,10 @@
 	EReference getXhtmlCiteType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getDfn()
 	 * @see #getXhtmlCiteType()
@@ -16278,9 +15711,10 @@
 	EReference getXhtmlCiteType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getCode()
 	 * @see #getXhtmlCiteType()
@@ -16289,9 +15723,10 @@
 	EReference getXhtmlCiteType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSamp()
 	 * @see #getXhtmlCiteType()
@@ -16300,9 +15735,10 @@
 	EReference getXhtmlCiteType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getKbd()
 	 * @see #getXhtmlCiteType()
@@ -16311,9 +15747,10 @@
 	EReference getXhtmlCiteType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getVar()
 	 * @see #getXhtmlCiteType()
@@ -16322,9 +15759,10 @@
 	EReference getXhtmlCiteType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getCite()
 	 * @see #getXhtmlCiteType()
@@ -16333,9 +15771,10 @@
 	EReference getXhtmlCiteType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getAbbr()
 	 * @see #getXhtmlCiteType()
@@ -16344,9 +15783,10 @@
 	EReference getXhtmlCiteType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getAcronym()
 	 * @see #getXhtmlCiteType()
@@ -16355,9 +15795,10 @@
 	EReference getXhtmlCiteType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getQ()
 	 * @see #getXhtmlCiteType()
@@ -16366,9 +15807,10 @@
 	EReference getXhtmlCiteType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getTt()
 	 * @see #getXhtmlCiteType()
@@ -16377,9 +15819,10 @@
 	EReference getXhtmlCiteType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getI()
 	 * @see #getXhtmlCiteType()
@@ -16388,9 +15831,10 @@
 	EReference getXhtmlCiteType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getB()
 	 * @see #getXhtmlCiteType()
@@ -16399,9 +15843,10 @@
 	EReference getXhtmlCiteType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getBig()
 	 * @see #getXhtmlCiteType()
@@ -16410,9 +15855,10 @@
 	EReference getXhtmlCiteType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSmall()
 	 * @see #getXhtmlCiteType()
@@ -16421,9 +15867,10 @@
 	EReference getXhtmlCiteType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSub()
 	 * @see #getXhtmlCiteType()
@@ -16432,9 +15879,10 @@
 	EReference getXhtmlCiteType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSup()
 	 * @see #getXhtmlCiteType()
@@ -16443,9 +15891,10 @@
 	EReference getXhtmlCiteType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getA()
 	 * @see #getXhtmlCiteType()
@@ -16454,9 +15903,10 @@
 	EReference getXhtmlCiteType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getObject()
 	 * @see #getXhtmlCiteType()
@@ -16465,9 +15915,10 @@
 	EReference getXhtmlCiteType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getIns()
 	 * @see #getXhtmlCiteType()
@@ -16476,9 +15927,10 @@
 	EReference getXhtmlCiteType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getDel()
 	 * @see #getXhtmlCiteType()
@@ -16487,9 +15939,9 @@
 	EReference getXhtmlCiteType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getClass_()
 	 * @see #getXhtmlCiteType()
@@ -16498,9 +15950,9 @@
 	EAttribute getXhtmlCiteType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getId <em>Id</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getId()
 	 * @see #getXhtmlCiteType()
@@ -16509,9 +15961,9 @@
 	EAttribute getXhtmlCiteType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getLang()
 	 * @see #getXhtmlCiteType()
@@ -16520,9 +15972,9 @@
 	EAttribute getXhtmlCiteType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getSpace()
 	 * @see #getXhtmlCiteType()
@@ -16531,9 +15983,9 @@
 	EAttribute getXhtmlCiteType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getStyle()
 	 * @see #getXhtmlCiteType()
@@ -16542,9 +15994,9 @@
 	EAttribute getXhtmlCiteType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType#getTitle()
 	 * @see #getXhtmlCiteType()
@@ -16553,9 +16005,9 @@
 	EAttribute getXhtmlCiteType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType <em>Code Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType <em>Code Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Code Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType
 	 * @generated
@@ -16563,9 +16015,9 @@
 	EClass getXhtmlCodeType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getMixed()
 	 * @see #getXhtmlCodeType()
@@ -16574,9 +16026,10 @@
 	EAttribute getXhtmlCodeType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getXhtmlInlineMix()
 	 * @see #getXhtmlCodeType()
@@ -16585,9 +16038,10 @@
 	EAttribute getXhtmlCodeType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getBr()
 	 * @see #getXhtmlCodeType()
@@ -16596,9 +16050,10 @@
 	EReference getXhtmlCodeType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSpan()
 	 * @see #getXhtmlCodeType()
@@ -16607,9 +16062,10 @@
 	EReference getXhtmlCodeType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getEm()
 	 * @see #getXhtmlCodeType()
@@ -16618,9 +16074,10 @@
 	EReference getXhtmlCodeType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getStrong()
 	 * @see #getXhtmlCodeType()
@@ -16629,9 +16086,10 @@
 	EReference getXhtmlCodeType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getDfn()
 	 * @see #getXhtmlCodeType()
@@ -16640,9 +16098,10 @@
 	EReference getXhtmlCodeType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getCode()
 	 * @see #getXhtmlCodeType()
@@ -16651,9 +16110,10 @@
 	EReference getXhtmlCodeType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSamp()
 	 * @see #getXhtmlCodeType()
@@ -16662,9 +16122,10 @@
 	EReference getXhtmlCodeType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getKbd()
 	 * @see #getXhtmlCodeType()
@@ -16673,9 +16134,10 @@
 	EReference getXhtmlCodeType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getVar()
 	 * @see #getXhtmlCodeType()
@@ -16684,9 +16146,10 @@
 	EReference getXhtmlCodeType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getCite()
 	 * @see #getXhtmlCodeType()
@@ -16695,9 +16158,10 @@
 	EReference getXhtmlCodeType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getAbbr()
 	 * @see #getXhtmlCodeType()
@@ -16706,9 +16170,10 @@
 	EReference getXhtmlCodeType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getAcronym()
 	 * @see #getXhtmlCodeType()
@@ -16717,9 +16182,10 @@
 	EReference getXhtmlCodeType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getQ()
 	 * @see #getXhtmlCodeType()
@@ -16728,9 +16194,10 @@
 	EReference getXhtmlCodeType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getTt()
 	 * @see #getXhtmlCodeType()
@@ -16739,9 +16206,10 @@
 	EReference getXhtmlCodeType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getI()
 	 * @see #getXhtmlCodeType()
@@ -16750,9 +16218,10 @@
 	EReference getXhtmlCodeType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getB()
 	 * @see #getXhtmlCodeType()
@@ -16761,9 +16230,10 @@
 	EReference getXhtmlCodeType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getBig()
 	 * @see #getXhtmlCodeType()
@@ -16772,9 +16242,10 @@
 	EReference getXhtmlCodeType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSmall()
 	 * @see #getXhtmlCodeType()
@@ -16783,9 +16254,10 @@
 	EReference getXhtmlCodeType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSub()
 	 * @see #getXhtmlCodeType()
@@ -16794,9 +16266,10 @@
 	EReference getXhtmlCodeType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSup()
 	 * @see #getXhtmlCodeType()
@@ -16805,9 +16278,10 @@
 	EReference getXhtmlCodeType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getA()
 	 * @see #getXhtmlCodeType()
@@ -16816,9 +16290,10 @@
 	EReference getXhtmlCodeType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getObject()
 	 * @see #getXhtmlCodeType()
@@ -16827,9 +16302,10 @@
 	EReference getXhtmlCodeType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getIns()
 	 * @see #getXhtmlCodeType()
@@ -16838,9 +16314,10 @@
 	EReference getXhtmlCodeType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getDel()
 	 * @see #getXhtmlCodeType()
@@ -16849,9 +16326,9 @@
 	EReference getXhtmlCodeType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getClass_()
 	 * @see #getXhtmlCodeType()
@@ -16860,9 +16337,9 @@
 	EAttribute getXhtmlCodeType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getId <em>Id</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getId()
 	 * @see #getXhtmlCodeType()
@@ -16871,9 +16348,9 @@
 	EAttribute getXhtmlCodeType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getLang()
 	 * @see #getXhtmlCodeType()
@@ -16882,9 +16359,9 @@
 	EAttribute getXhtmlCodeType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getSpace()
 	 * @see #getXhtmlCodeType()
@@ -16893,9 +16370,9 @@
 	EAttribute getXhtmlCodeType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getStyle()
 	 * @see #getXhtmlCodeType()
@@ -16904,9 +16381,9 @@
 	EAttribute getXhtmlCodeType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType#getTitle()
 	 * @see #getXhtmlCodeType()
@@ -16915,9 +16392,9 @@
 	EAttribute getXhtmlCodeType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType <em>Colgroup Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType <em>Colgroup Type</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Colgroup Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType
 	 * @generated
@@ -16925,9 +16402,10 @@
 	EClass getXhtmlColgroupType();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getCol <em>Col</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getCol <em>Col</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Col</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getCol()
 	 * @see #getXhtmlColgroupType()
@@ -16936,9 +16414,9 @@
 	EReference getXhtmlColgroupType_Col();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getAlign <em>Align</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getAlign
+	 * <em>Align</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Align</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getAlign()
 	 * @see #getXhtmlColgroupType()
@@ -16947,9 +16425,9 @@
 	EAttribute getXhtmlColgroupType_Align();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getChar <em>Char</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getChar
+	 * <em>Char</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Char</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getChar()
 	 * @see #getXhtmlColgroupType()
@@ -16958,9 +16436,9 @@
 	EAttribute getXhtmlColgroupType_Char();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getCharoff <em>Charoff</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getCharoff
+	 * <em>Charoff</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Charoff</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getCharoff()
 	 * @see #getXhtmlColgroupType()
@@ -16969,9 +16447,9 @@
 	EAttribute getXhtmlColgroupType_Charoff();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getClass_()
 	 * @see #getXhtmlColgroupType()
@@ -16980,9 +16458,9 @@
 	EAttribute getXhtmlColgroupType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getId
+	 * <em>Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getId()
 	 * @see #getXhtmlColgroupType()
@@ -16991,9 +16469,9 @@
 	EAttribute getXhtmlColgroupType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getLang()
 	 * @see #getXhtmlColgroupType()
@@ -17002,9 +16480,9 @@
 	EAttribute getXhtmlColgroupType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpace()
 	 * @see #getXhtmlColgroupType()
@@ -17013,9 +16491,9 @@
 	EAttribute getXhtmlColgroupType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpan
+	 * <em>Span</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getSpan()
 	 * @see #getXhtmlColgroupType()
@@ -17024,9 +16502,9 @@
 	EAttribute getXhtmlColgroupType_Span();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getStyle()
 	 * @see #getXhtmlColgroupType()
@@ -17035,9 +16513,9 @@
 	EAttribute getXhtmlColgroupType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getTitle()
 	 * @see #getXhtmlColgroupType()
@@ -17046,9 +16524,9 @@
 	EAttribute getXhtmlColgroupType_Title();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getValign <em>Valign</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getValign
+	 * <em>Valign</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Valign</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getValign()
 	 * @see #getXhtmlColgroupType()
@@ -17057,9 +16535,9 @@
 	EAttribute getXhtmlColgroupType_Valign();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getWidth <em>Width</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getWidth
+	 * <em>Width</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Width</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType#getWidth()
 	 * @see #getXhtmlColgroupType()
@@ -17068,9 +16546,9 @@
 	EAttribute getXhtmlColgroupType_Width();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType <em>Col Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType <em>Col Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Col Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColType
 	 * @generated
@@ -17078,9 +16556,9 @@
 	EClass getXhtmlColType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getAlign <em>Align</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getAlign
+	 * <em>Align</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Align</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getAlign()
 	 * @see #getXhtmlColType()
@@ -17089,9 +16567,9 @@
 	EAttribute getXhtmlColType_Align();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getChar <em>Char</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getChar
+	 * <em>Char</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Char</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getChar()
 	 * @see #getXhtmlColType()
@@ -17100,9 +16578,9 @@
 	EAttribute getXhtmlColType_Char();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getCharoff <em>Charoff</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getCharoff
+	 * <em>Charoff</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Charoff</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getCharoff()
 	 * @see #getXhtmlColType()
@@ -17111,9 +16589,9 @@
 	EAttribute getXhtmlColType_Charoff();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getClass_()
 	 * @see #getXhtmlColType()
@@ -17123,8 +16601,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getId()
 	 * @see #getXhtmlColType()
@@ -17133,9 +16611,9 @@
 	EAttribute getXhtmlColType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getLang()
 	 * @see #getXhtmlColType()
@@ -17144,9 +16622,9 @@
 	EAttribute getXhtmlColType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpace()
 	 * @see #getXhtmlColType()
@@ -17155,9 +16633,9 @@
 	EAttribute getXhtmlColType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpan
+	 * <em>Span</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getSpan()
 	 * @see #getXhtmlColType()
@@ -17166,9 +16644,9 @@
 	EAttribute getXhtmlColType_Span();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getStyle()
 	 * @see #getXhtmlColType()
@@ -17177,9 +16655,9 @@
 	EAttribute getXhtmlColType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getTitle()
 	 * @see #getXhtmlColType()
@@ -17188,9 +16666,9 @@
 	EAttribute getXhtmlColType_Title();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getValign <em>Valign</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getValign
+	 * <em>Valign</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Valign</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getValign()
 	 * @see #getXhtmlColType()
@@ -17199,9 +16677,9 @@
 	EAttribute getXhtmlColType_Valign();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getWidth <em>Width</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getWidth
+	 * <em>Width</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Width</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColType#getWidth()
 	 * @see #getXhtmlColType()
@@ -17210,9 +16688,9 @@
 	EAttribute getXhtmlColType_Width();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType <em>Dd Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType <em>Dd Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Dd Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType
 	 * @generated
@@ -17220,9 +16698,9 @@
 	EClass getXhtmlDdType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getMixed()
 	 * @see #getXhtmlDdType()
@@ -17231,9 +16709,9 @@
 	EAttribute getXhtmlDdType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getXhtmlFlowMix
+	 * <em>Xhtml Flow Mix</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Flow Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getXhtmlFlowMix()
 	 * @see #getXhtmlDdType()
@@ -17242,9 +16720,10 @@
 	EAttribute getXhtmlDdType_XhtmlFlowMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH1 <em>H1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH1 <em>H1</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H1</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH1()
 	 * @see #getXhtmlDdType()
@@ -17253,9 +16732,10 @@
 	EReference getXhtmlDdType_H1();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH2 <em>H2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH2 <em>H2</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H2</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH2()
 	 * @see #getXhtmlDdType()
@@ -17264,9 +16744,10 @@
 	EReference getXhtmlDdType_H2();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH3 <em>H3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH3 <em>H3</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H3</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH3()
 	 * @see #getXhtmlDdType()
@@ -17275,9 +16756,10 @@
 	EReference getXhtmlDdType_H3();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH4 <em>H4</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH4 <em>H4</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H4</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH4()
 	 * @see #getXhtmlDdType()
@@ -17286,9 +16768,10 @@
 	EReference getXhtmlDdType_H4();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH5 <em>H5</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH5 <em>H5</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H5</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH5()
 	 * @see #getXhtmlDdType()
@@ -17297,9 +16780,10 @@
 	EReference getXhtmlDdType_H5();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH6 <em>H6</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH6 <em>H6</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H6</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getH6()
 	 * @see #getXhtmlDdType()
@@ -17308,9 +16792,10 @@
 	EReference getXhtmlDdType_H6();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getUl <em>Ul</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getUl <em>Ul</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ul</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getUl()
 	 * @see #getXhtmlDdType()
@@ -17319,9 +16804,10 @@
 	EReference getXhtmlDdType_Ul();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getOl <em>Ol</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getOl <em>Ol</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ol</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getOl()
 	 * @see #getXhtmlDdType()
@@ -17330,9 +16816,10 @@
 	EReference getXhtmlDdType_Ol();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDl <em>Dl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDl <em>Dl</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dl</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDl()
 	 * @see #getXhtmlDdType()
@@ -17341,9 +16828,9 @@
 	EReference getXhtmlDdType_Dl();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getP <em>P</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getP <em>P</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>P</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getP()
 	 * @see #getXhtmlDdType()
@@ -17352,9 +16839,10 @@
 	EReference getXhtmlDdType_P();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDiv <em>Div</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDiv <em>Div</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Div</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDiv()
 	 * @see #getXhtmlDdType()
@@ -17363,9 +16851,10 @@
 	EReference getXhtmlDdType_Div();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getPre <em>Pre</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getPre <em>Pre</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Pre</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getPre()
 	 * @see #getXhtmlDdType()
@@ -17374,9 +16863,10 @@
 	EReference getXhtmlDdType_Pre();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getBlockquote <em>Blockquote</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getBlockquote <em>Blockquote</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Blockquote</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getBlockquote()
 	 * @see #getXhtmlDdType()
@@ -17385,9 +16875,10 @@
 	EReference getXhtmlDdType_Blockquote();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getAddress <em>Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getAddress <em>Address</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Address</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getAddress()
 	 * @see #getXhtmlDdType()
@@ -17396,9 +16887,10 @@
 	EReference getXhtmlDdType_Address();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getHr <em>Hr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getHr <em>Hr</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Hr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getHr()
 	 * @see #getXhtmlDdType()
@@ -17407,9 +16899,10 @@
 	EReference getXhtmlDdType_Hr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTable <em>Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTable <em>Table</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Table</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTable()
 	 * @see #getXhtmlDdType()
@@ -17418,9 +16911,10 @@
 	EReference getXhtmlDdType_Table();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getBr()
 	 * @see #getXhtmlDdType()
@@ -17429,9 +16923,10 @@
 	EReference getXhtmlDdType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSpan()
 	 * @see #getXhtmlDdType()
@@ -17440,9 +16935,10 @@
 	EReference getXhtmlDdType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getEm()
 	 * @see #getXhtmlDdType()
@@ -17451,9 +16947,10 @@
 	EReference getXhtmlDdType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getStrong()
 	 * @see #getXhtmlDdType()
@@ -17462,9 +16959,10 @@
 	EReference getXhtmlDdType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDfn()
 	 * @see #getXhtmlDdType()
@@ -17473,9 +16971,10 @@
 	EReference getXhtmlDdType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getCode()
 	 * @see #getXhtmlDdType()
@@ -17484,9 +16983,10 @@
 	EReference getXhtmlDdType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSamp()
 	 * @see #getXhtmlDdType()
@@ -17495,9 +16995,10 @@
 	EReference getXhtmlDdType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getKbd()
 	 * @see #getXhtmlDdType()
@@ -17506,9 +17007,10 @@
 	EReference getXhtmlDdType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getVar()
 	 * @see #getXhtmlDdType()
@@ -17517,9 +17019,10 @@
 	EReference getXhtmlDdType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getCite()
 	 * @see #getXhtmlDdType()
@@ -17528,9 +17031,10 @@
 	EReference getXhtmlDdType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getAbbr()
 	 * @see #getXhtmlDdType()
@@ -17539,9 +17043,10 @@
 	EReference getXhtmlDdType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getAcronym()
 	 * @see #getXhtmlDdType()
@@ -17550,9 +17055,9 @@
 	EReference getXhtmlDdType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getQ()
 	 * @see #getXhtmlDdType()
@@ -17561,9 +17066,10 @@
 	EReference getXhtmlDdType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTt()
 	 * @see #getXhtmlDdType()
@@ -17572,9 +17078,9 @@
 	EReference getXhtmlDdType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getI()
 	 * @see #getXhtmlDdType()
@@ -17583,9 +17089,9 @@
 	EReference getXhtmlDdType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getB()
 	 * @see #getXhtmlDdType()
@@ -17594,9 +17100,10 @@
 	EReference getXhtmlDdType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getBig()
 	 * @see #getXhtmlDdType()
@@ -17605,9 +17112,10 @@
 	EReference getXhtmlDdType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSmall()
 	 * @see #getXhtmlDdType()
@@ -17616,9 +17124,10 @@
 	EReference getXhtmlDdType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSub()
 	 * @see #getXhtmlDdType()
@@ -17627,9 +17136,10 @@
 	EReference getXhtmlDdType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSup()
 	 * @see #getXhtmlDdType()
@@ -17638,9 +17148,9 @@
 	EReference getXhtmlDdType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getA()
 	 * @see #getXhtmlDdType()
@@ -17649,9 +17159,10 @@
 	EReference getXhtmlDdType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getObject()
 	 * @see #getXhtmlDdType()
@@ -17660,9 +17171,10 @@
 	EReference getXhtmlDdType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getIns()
 	 * @see #getXhtmlDdType()
@@ -17671,9 +17183,10 @@
 	EReference getXhtmlDdType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getDel()
 	 * @see #getXhtmlDdType()
@@ -17682,9 +17195,9 @@
 	EReference getXhtmlDdType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getClass_()
 	 * @see #getXhtmlDdType()
@@ -17694,8 +17207,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getId()
 	 * @see #getXhtmlDdType()
@@ -17704,9 +17217,9 @@
 	EAttribute getXhtmlDdType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getLang()
 	 * @see #getXhtmlDdType()
@@ -17715,9 +17228,9 @@
 	EAttribute getXhtmlDdType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getSpace()
 	 * @see #getXhtmlDdType()
@@ -17726,9 +17239,9 @@
 	EAttribute getXhtmlDdType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getStyle()
 	 * @see #getXhtmlDdType()
@@ -17737,9 +17250,9 @@
 	EAttribute getXhtmlDdType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType#getTitle()
 	 * @see #getXhtmlDdType()
@@ -17748,9 +17261,9 @@
 	EAttribute getXhtmlDdType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType <em>Dfn Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType <em>Dfn Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Dfn Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType
 	 * @generated
@@ -17758,9 +17271,9 @@
 	EClass getXhtmlDfnType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getMixed()
 	 * @see #getXhtmlDfnType()
@@ -17769,9 +17282,10 @@
 	EAttribute getXhtmlDfnType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getXhtmlInlineMix()
 	 * @see #getXhtmlDfnType()
@@ -17780,9 +17294,10 @@
 	EAttribute getXhtmlDfnType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getBr()
 	 * @see #getXhtmlDfnType()
@@ -17791,9 +17306,10 @@
 	EReference getXhtmlDfnType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSpan()
 	 * @see #getXhtmlDfnType()
@@ -17802,9 +17318,10 @@
 	EReference getXhtmlDfnType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getEm()
 	 * @see #getXhtmlDfnType()
@@ -17813,9 +17330,10 @@
 	EReference getXhtmlDfnType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getStrong()
 	 * @see #getXhtmlDfnType()
@@ -17824,9 +17342,10 @@
 	EReference getXhtmlDfnType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getDfn()
 	 * @see #getXhtmlDfnType()
@@ -17835,9 +17354,10 @@
 	EReference getXhtmlDfnType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getCode()
 	 * @see #getXhtmlDfnType()
@@ -17846,9 +17366,10 @@
 	EReference getXhtmlDfnType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSamp()
 	 * @see #getXhtmlDfnType()
@@ -17857,9 +17378,10 @@
 	EReference getXhtmlDfnType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getKbd()
 	 * @see #getXhtmlDfnType()
@@ -17868,9 +17390,10 @@
 	EReference getXhtmlDfnType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getVar()
 	 * @see #getXhtmlDfnType()
@@ -17879,9 +17402,10 @@
 	EReference getXhtmlDfnType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getCite()
 	 * @see #getXhtmlDfnType()
@@ -17890,9 +17414,10 @@
 	EReference getXhtmlDfnType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getAbbr()
 	 * @see #getXhtmlDfnType()
@@ -17901,9 +17426,10 @@
 	EReference getXhtmlDfnType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getAcronym()
 	 * @see #getXhtmlDfnType()
@@ -17912,9 +17438,10 @@
 	EReference getXhtmlDfnType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getQ()
 	 * @see #getXhtmlDfnType()
@@ -17923,9 +17450,10 @@
 	EReference getXhtmlDfnType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getTt()
 	 * @see #getXhtmlDfnType()
@@ -17934,9 +17462,10 @@
 	EReference getXhtmlDfnType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getI()
 	 * @see #getXhtmlDfnType()
@@ -17945,9 +17474,10 @@
 	EReference getXhtmlDfnType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getB()
 	 * @see #getXhtmlDfnType()
@@ -17956,9 +17486,10 @@
 	EReference getXhtmlDfnType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getBig()
 	 * @see #getXhtmlDfnType()
@@ -17967,9 +17498,10 @@
 	EReference getXhtmlDfnType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSmall()
 	 * @see #getXhtmlDfnType()
@@ -17978,9 +17510,10 @@
 	EReference getXhtmlDfnType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSub()
 	 * @see #getXhtmlDfnType()
@@ -17989,9 +17522,10 @@
 	EReference getXhtmlDfnType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSup()
 	 * @see #getXhtmlDfnType()
@@ -18000,9 +17534,10 @@
 	EReference getXhtmlDfnType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getA()
 	 * @see #getXhtmlDfnType()
@@ -18011,9 +17546,10 @@
 	EReference getXhtmlDfnType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getObject()
 	 * @see #getXhtmlDfnType()
@@ -18022,9 +17558,10 @@
 	EReference getXhtmlDfnType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getIns()
 	 * @see #getXhtmlDfnType()
@@ -18033,9 +17570,10 @@
 	EReference getXhtmlDfnType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getDel()
 	 * @see #getXhtmlDfnType()
@@ -18044,9 +17582,9 @@
 	EReference getXhtmlDfnType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getClass_()
 	 * @see #getXhtmlDfnType()
@@ -18056,8 +17594,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getId()
 	 * @see #getXhtmlDfnType()
@@ -18066,9 +17604,9 @@
 	EAttribute getXhtmlDfnType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getLang()
 	 * @see #getXhtmlDfnType()
@@ -18077,9 +17615,9 @@
 	EAttribute getXhtmlDfnType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getSpace()
 	 * @see #getXhtmlDfnType()
@@ -18088,9 +17626,9 @@
 	EAttribute getXhtmlDfnType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getStyle()
 	 * @see #getXhtmlDfnType()
@@ -18099,9 +17637,9 @@
 	EAttribute getXhtmlDfnType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType#getTitle()
 	 * @see #getXhtmlDfnType()
@@ -18110,9 +17648,9 @@
 	EAttribute getXhtmlDfnType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType <em>Div Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType <em>Div Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Div Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType
 	 * @generated
@@ -18120,9 +17658,9 @@
 	EClass getXhtmlDivType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getMixed()
 	 * @see #getXhtmlDivType()
@@ -18131,9 +17669,10 @@
 	EAttribute getXhtmlDivType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Flow Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getXhtmlFlowMix()
 	 * @see #getXhtmlDivType()
@@ -18142,9 +17681,10 @@
 	EAttribute getXhtmlDivType_XhtmlFlowMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH1 <em>H1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH1 <em>H1</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H1</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH1()
 	 * @see #getXhtmlDivType()
@@ -18153,9 +17693,10 @@
 	EReference getXhtmlDivType_H1();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH2 <em>H2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH2 <em>H2</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H2</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH2()
 	 * @see #getXhtmlDivType()
@@ -18164,9 +17705,10 @@
 	EReference getXhtmlDivType_H2();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH3 <em>H3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH3 <em>H3</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H3</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH3()
 	 * @see #getXhtmlDivType()
@@ -18175,9 +17717,10 @@
 	EReference getXhtmlDivType_H3();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH4 <em>H4</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH4 <em>H4</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H4</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH4()
 	 * @see #getXhtmlDivType()
@@ -18186,9 +17729,10 @@
 	EReference getXhtmlDivType_H4();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH5 <em>H5</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH5 <em>H5</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H5</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH5()
 	 * @see #getXhtmlDivType()
@@ -18197,9 +17741,10 @@
 	EReference getXhtmlDivType_H5();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH6 <em>H6</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH6 <em>H6</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H6</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getH6()
 	 * @see #getXhtmlDivType()
@@ -18208,9 +17753,10 @@
 	EReference getXhtmlDivType_H6();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getUl <em>Ul</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getUl <em>Ul</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ul</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getUl()
 	 * @see #getXhtmlDivType()
@@ -18219,9 +17765,10 @@
 	EReference getXhtmlDivType_Ul();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getOl <em>Ol</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getOl <em>Ol</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ol</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getOl()
 	 * @see #getXhtmlDivType()
@@ -18230,9 +17777,10 @@
 	EReference getXhtmlDivType_Ol();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDl <em>Dl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDl <em>Dl</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dl</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDl()
 	 * @see #getXhtmlDivType()
@@ -18241,9 +17789,10 @@
 	EReference getXhtmlDivType_Dl();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getP <em>P</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getP <em>P</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>P</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getP()
 	 * @see #getXhtmlDivType()
@@ -18252,9 +17801,10 @@
 	EReference getXhtmlDivType_P();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDiv <em>Div</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDiv <em>Div</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Div</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDiv()
 	 * @see #getXhtmlDivType()
@@ -18263,9 +17813,10 @@
 	EReference getXhtmlDivType_Div();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getPre <em>Pre</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getPre <em>Pre</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Pre</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getPre()
 	 * @see #getXhtmlDivType()
@@ -18274,9 +17825,10 @@
 	EReference getXhtmlDivType_Pre();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getBlockquote <em>Blockquote</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getBlockquote <em>Blockquote</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Blockquote</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getBlockquote()
 	 * @see #getXhtmlDivType()
@@ -18285,9 +17837,10 @@
 	EReference getXhtmlDivType_Blockquote();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getAddress <em>Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getAddress <em>Address</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Address</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getAddress()
 	 * @see #getXhtmlDivType()
@@ -18296,9 +17849,10 @@
 	EReference getXhtmlDivType_Address();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getHr <em>Hr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getHr <em>Hr</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Hr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getHr()
 	 * @see #getXhtmlDivType()
@@ -18307,9 +17861,10 @@
 	EReference getXhtmlDivType_Hr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getTable <em>Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getTable <em>Table</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Table</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getTable()
 	 * @see #getXhtmlDivType()
@@ -18318,9 +17873,10 @@
 	EReference getXhtmlDivType_Table();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getBr()
 	 * @see #getXhtmlDivType()
@@ -18329,9 +17885,10 @@
 	EReference getXhtmlDivType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSpan()
 	 * @see #getXhtmlDivType()
@@ -18340,9 +17897,10 @@
 	EReference getXhtmlDivType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getEm()
 	 * @see #getXhtmlDivType()
@@ -18351,9 +17909,10 @@
 	EReference getXhtmlDivType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getStrong()
 	 * @see #getXhtmlDivType()
@@ -18362,9 +17921,10 @@
 	EReference getXhtmlDivType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDfn()
 	 * @see #getXhtmlDivType()
@@ -18373,9 +17933,10 @@
 	EReference getXhtmlDivType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getCode()
 	 * @see #getXhtmlDivType()
@@ -18384,9 +17945,10 @@
 	EReference getXhtmlDivType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSamp()
 	 * @see #getXhtmlDivType()
@@ -18395,9 +17957,10 @@
 	EReference getXhtmlDivType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getKbd()
 	 * @see #getXhtmlDivType()
@@ -18406,9 +17969,10 @@
 	EReference getXhtmlDivType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getVar()
 	 * @see #getXhtmlDivType()
@@ -18417,9 +17981,10 @@
 	EReference getXhtmlDivType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getCite()
 	 * @see #getXhtmlDivType()
@@ -18428,9 +17993,10 @@
 	EReference getXhtmlDivType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getAbbr()
 	 * @see #getXhtmlDivType()
@@ -18439,9 +18005,10 @@
 	EReference getXhtmlDivType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getAcronym()
 	 * @see #getXhtmlDivType()
@@ -18450,9 +18017,10 @@
 	EReference getXhtmlDivType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getQ()
 	 * @see #getXhtmlDivType()
@@ -18461,9 +18029,10 @@
 	EReference getXhtmlDivType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getTt()
 	 * @see #getXhtmlDivType()
@@ -18472,9 +18041,10 @@
 	EReference getXhtmlDivType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getI()
 	 * @see #getXhtmlDivType()
@@ -18483,9 +18053,10 @@
 	EReference getXhtmlDivType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getB()
 	 * @see #getXhtmlDivType()
@@ -18494,9 +18065,10 @@
 	EReference getXhtmlDivType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getBig()
 	 * @see #getXhtmlDivType()
@@ -18505,9 +18077,10 @@
 	EReference getXhtmlDivType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSmall()
 	 * @see #getXhtmlDivType()
@@ -18516,9 +18089,10 @@
 	EReference getXhtmlDivType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSub()
 	 * @see #getXhtmlDivType()
@@ -18527,9 +18101,10 @@
 	EReference getXhtmlDivType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSup()
 	 * @see #getXhtmlDivType()
@@ -18538,9 +18113,10 @@
 	EReference getXhtmlDivType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getA()
 	 * @see #getXhtmlDivType()
@@ -18549,9 +18125,10 @@
 	EReference getXhtmlDivType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getObject()
 	 * @see #getXhtmlDivType()
@@ -18560,9 +18137,10 @@
 	EReference getXhtmlDivType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getIns()
 	 * @see #getXhtmlDivType()
@@ -18571,9 +18149,10 @@
 	EReference getXhtmlDivType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getDel()
 	 * @see #getXhtmlDivType()
@@ -18582,9 +18161,9 @@
 	EReference getXhtmlDivType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getClass_()
 	 * @see #getXhtmlDivType()
@@ -18594,8 +18173,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getId()
 	 * @see #getXhtmlDivType()
@@ -18604,9 +18183,9 @@
 	EAttribute getXhtmlDivType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getLang()
 	 * @see #getXhtmlDivType()
@@ -18615,9 +18194,9 @@
 	EAttribute getXhtmlDivType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getSpace()
 	 * @see #getXhtmlDivType()
@@ -18626,9 +18205,9 @@
 	EAttribute getXhtmlDivType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getStyle()
 	 * @see #getXhtmlDivType()
@@ -18637,9 +18216,9 @@
 	EAttribute getXhtmlDivType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType#getTitle()
 	 * @see #getXhtmlDivType()
@@ -18648,9 +18227,9 @@
 	EAttribute getXhtmlDivType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType <em>Dl Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType <em>Dl Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Dl Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDlType
 	 * @generated
@@ -18658,9 +18237,9 @@
 	EClass getXhtmlDlType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getGroup <em>Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getGroup
+	 * <em>Group</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Group</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getGroup()
 	 * @see #getXhtmlDlType()
@@ -18669,9 +18248,10 @@
 	EAttribute getXhtmlDlType_Group();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getDt <em>Dt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getDt <em>Dt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getDt()
 	 * @see #getXhtmlDlType()
@@ -18680,9 +18260,10 @@
 	EReference getXhtmlDlType_Dt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getDd <em>Dd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getDd <em>Dd</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getDd()
 	 * @see #getXhtmlDlType()
@@ -18691,9 +18272,9 @@
 	EReference getXhtmlDlType_Dd();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getClass_()
 	 * @see #getXhtmlDlType()
@@ -18703,8 +18284,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getId()
 	 * @see #getXhtmlDlType()
@@ -18713,9 +18294,9 @@
 	EAttribute getXhtmlDlType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getLang()
 	 * @see #getXhtmlDlType()
@@ -18724,9 +18305,9 @@
 	EAttribute getXhtmlDlType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getSpace()
 	 * @see #getXhtmlDlType()
@@ -18735,9 +18316,9 @@
 	EAttribute getXhtmlDlType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getStyle()
 	 * @see #getXhtmlDlType()
@@ -18746,9 +18327,9 @@
 	EAttribute getXhtmlDlType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDlType#getTitle()
 	 * @see #getXhtmlDlType()
@@ -18757,9 +18338,9 @@
 	EAttribute getXhtmlDlType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType <em>Dt Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType <em>Dt Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Dt Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType
 	 * @generated
@@ -18767,9 +18348,9 @@
 	EClass getXhtmlDtType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getMixed()
 	 * @see #getXhtmlDtType()
@@ -18778,9 +18359,10 @@
 	EAttribute getXhtmlDtType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getXhtmlInlineMix()
 	 * @see #getXhtmlDtType()
@@ -18789,9 +18371,10 @@
 	EAttribute getXhtmlDtType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getBr()
 	 * @see #getXhtmlDtType()
@@ -18800,9 +18383,10 @@
 	EReference getXhtmlDtType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSpan()
 	 * @see #getXhtmlDtType()
@@ -18811,9 +18395,10 @@
 	EReference getXhtmlDtType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getEm()
 	 * @see #getXhtmlDtType()
@@ -18822,9 +18407,10 @@
 	EReference getXhtmlDtType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getStrong()
 	 * @see #getXhtmlDtType()
@@ -18833,9 +18419,10 @@
 	EReference getXhtmlDtType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getDfn()
 	 * @see #getXhtmlDtType()
@@ -18844,9 +18431,10 @@
 	EReference getXhtmlDtType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getCode()
 	 * @see #getXhtmlDtType()
@@ -18855,9 +18443,10 @@
 	EReference getXhtmlDtType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSamp()
 	 * @see #getXhtmlDtType()
@@ -18866,9 +18455,10 @@
 	EReference getXhtmlDtType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getKbd()
 	 * @see #getXhtmlDtType()
@@ -18877,9 +18467,10 @@
 	EReference getXhtmlDtType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getVar()
 	 * @see #getXhtmlDtType()
@@ -18888,9 +18479,10 @@
 	EReference getXhtmlDtType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getCite()
 	 * @see #getXhtmlDtType()
@@ -18899,9 +18491,10 @@
 	EReference getXhtmlDtType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getAbbr()
 	 * @see #getXhtmlDtType()
@@ -18910,9 +18503,10 @@
 	EReference getXhtmlDtType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getAcronym()
 	 * @see #getXhtmlDtType()
@@ -18921,9 +18515,9 @@
 	EReference getXhtmlDtType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getQ()
 	 * @see #getXhtmlDtType()
@@ -18932,9 +18526,10 @@
 	EReference getXhtmlDtType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getTt()
 	 * @see #getXhtmlDtType()
@@ -18943,9 +18538,9 @@
 	EReference getXhtmlDtType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getI()
 	 * @see #getXhtmlDtType()
@@ -18954,9 +18549,9 @@
 	EReference getXhtmlDtType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getB()
 	 * @see #getXhtmlDtType()
@@ -18965,9 +18560,10 @@
 	EReference getXhtmlDtType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getBig()
 	 * @see #getXhtmlDtType()
@@ -18976,9 +18572,10 @@
 	EReference getXhtmlDtType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSmall()
 	 * @see #getXhtmlDtType()
@@ -18987,9 +18584,10 @@
 	EReference getXhtmlDtType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSub()
 	 * @see #getXhtmlDtType()
@@ -18998,9 +18596,10 @@
 	EReference getXhtmlDtType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSup()
 	 * @see #getXhtmlDtType()
@@ -19009,9 +18608,9 @@
 	EReference getXhtmlDtType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getA()
 	 * @see #getXhtmlDtType()
@@ -19020,9 +18619,10 @@
 	EReference getXhtmlDtType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getObject()
 	 * @see #getXhtmlDtType()
@@ -19031,9 +18631,10 @@
 	EReference getXhtmlDtType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getIns()
 	 * @see #getXhtmlDtType()
@@ -19042,9 +18643,10 @@
 	EReference getXhtmlDtType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getDel()
 	 * @see #getXhtmlDtType()
@@ -19053,9 +18655,9 @@
 	EReference getXhtmlDtType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getClass_()
 	 * @see #getXhtmlDtType()
@@ -19065,8 +18667,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getId()
 	 * @see #getXhtmlDtType()
@@ -19075,9 +18677,9 @@
 	EAttribute getXhtmlDtType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getLang()
 	 * @see #getXhtmlDtType()
@@ -19086,9 +18688,9 @@
 	EAttribute getXhtmlDtType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getSpace()
 	 * @see #getXhtmlDtType()
@@ -19097,9 +18699,9 @@
 	EAttribute getXhtmlDtType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getStyle()
 	 * @see #getXhtmlDtType()
@@ -19108,9 +18710,9 @@
 	EAttribute getXhtmlDtType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType#getTitle()
 	 * @see #getXhtmlDtType()
@@ -19119,9 +18721,9 @@
 	EAttribute getXhtmlDtType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType <em>Edit Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType <em>Edit Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Edit Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType
 	 * @generated
@@ -19129,9 +18731,9 @@
 	EClass getXhtmlEditType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getMixed()
 	 * @see #getXhtmlEditType()
@@ -19140,9 +18742,10 @@
 	EAttribute getXhtmlEditType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Flow Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getXhtmlFlowMix()
 	 * @see #getXhtmlEditType()
@@ -19151,9 +18754,10 @@
 	EAttribute getXhtmlEditType_XhtmlFlowMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH1 <em>H1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH1 <em>H1</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H1</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH1()
 	 * @see #getXhtmlEditType()
@@ -19162,9 +18766,10 @@
 	EReference getXhtmlEditType_H1();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH2 <em>H2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH2 <em>H2</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H2</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH2()
 	 * @see #getXhtmlEditType()
@@ -19173,9 +18778,10 @@
 	EReference getXhtmlEditType_H2();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH3 <em>H3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH3 <em>H3</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H3</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH3()
 	 * @see #getXhtmlEditType()
@@ -19184,9 +18790,10 @@
 	EReference getXhtmlEditType_H3();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH4 <em>H4</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH4 <em>H4</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H4</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH4()
 	 * @see #getXhtmlEditType()
@@ -19195,9 +18802,10 @@
 	EReference getXhtmlEditType_H4();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH5 <em>H5</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH5 <em>H5</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H5</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH5()
 	 * @see #getXhtmlEditType()
@@ -19206,9 +18814,10 @@
 	EReference getXhtmlEditType_H5();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH6 <em>H6</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH6 <em>H6</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H6</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getH6()
 	 * @see #getXhtmlEditType()
@@ -19217,9 +18826,10 @@
 	EReference getXhtmlEditType_H6();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getUl <em>Ul</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getUl <em>Ul</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ul</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getUl()
 	 * @see #getXhtmlEditType()
@@ -19228,9 +18838,10 @@
 	EReference getXhtmlEditType_Ul();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getOl <em>Ol</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getOl <em>Ol</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ol</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getOl()
 	 * @see #getXhtmlEditType()
@@ -19239,9 +18850,10 @@
 	EReference getXhtmlEditType_Ol();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDl <em>Dl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDl <em>Dl</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dl</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDl()
 	 * @see #getXhtmlEditType()
@@ -19250,9 +18862,10 @@
 	EReference getXhtmlEditType_Dl();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getP <em>P</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getP <em>P</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>P</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getP()
 	 * @see #getXhtmlEditType()
@@ -19261,9 +18874,10 @@
 	EReference getXhtmlEditType_P();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDiv <em>Div</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDiv <em>Div</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Div</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDiv()
 	 * @see #getXhtmlEditType()
@@ -19272,9 +18886,10 @@
 	EReference getXhtmlEditType_Div();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getPre <em>Pre</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getPre <em>Pre</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Pre</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getPre()
 	 * @see #getXhtmlEditType()
@@ -19283,9 +18898,10 @@
 	EReference getXhtmlEditType_Pre();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getBlockquote <em>Blockquote</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getBlockquote <em>Blockquote</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Blockquote</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getBlockquote()
 	 * @see #getXhtmlEditType()
@@ -19294,9 +18910,10 @@
 	EReference getXhtmlEditType_Blockquote();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getAddress <em>Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getAddress <em>Address</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Address</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getAddress()
 	 * @see #getXhtmlEditType()
@@ -19305,9 +18922,10 @@
 	EReference getXhtmlEditType_Address();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getHr <em>Hr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getHr <em>Hr</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Hr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getHr()
 	 * @see #getXhtmlEditType()
@@ -19316,9 +18934,10 @@
 	EReference getXhtmlEditType_Hr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getTable <em>Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getTable <em>Table</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Table</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getTable()
 	 * @see #getXhtmlEditType()
@@ -19327,9 +18946,10 @@
 	EReference getXhtmlEditType_Table();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getBr()
 	 * @see #getXhtmlEditType()
@@ -19338,9 +18958,10 @@
 	EReference getXhtmlEditType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSpan()
 	 * @see #getXhtmlEditType()
@@ -19349,9 +18970,10 @@
 	EReference getXhtmlEditType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getEm()
 	 * @see #getXhtmlEditType()
@@ -19360,9 +18982,10 @@
 	EReference getXhtmlEditType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getStrong()
 	 * @see #getXhtmlEditType()
@@ -19371,9 +18994,10 @@
 	EReference getXhtmlEditType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDfn()
 	 * @see #getXhtmlEditType()
@@ -19382,9 +19006,10 @@
 	EReference getXhtmlEditType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getCode()
 	 * @see #getXhtmlEditType()
@@ -19393,9 +19018,10 @@
 	EReference getXhtmlEditType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSamp()
 	 * @see #getXhtmlEditType()
@@ -19404,9 +19030,10 @@
 	EReference getXhtmlEditType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getKbd()
 	 * @see #getXhtmlEditType()
@@ -19415,9 +19042,10 @@
 	EReference getXhtmlEditType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getVar()
 	 * @see #getXhtmlEditType()
@@ -19426,9 +19054,10 @@
 	EReference getXhtmlEditType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getCite()
 	 * @see #getXhtmlEditType()
@@ -19437,9 +19066,10 @@
 	EReference getXhtmlEditType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getAbbr()
 	 * @see #getXhtmlEditType()
@@ -19448,9 +19078,10 @@
 	EReference getXhtmlEditType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getAcronym()
 	 * @see #getXhtmlEditType()
@@ -19459,9 +19090,10 @@
 	EReference getXhtmlEditType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getQ()
 	 * @see #getXhtmlEditType()
@@ -19470,9 +19102,10 @@
 	EReference getXhtmlEditType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getTt()
 	 * @see #getXhtmlEditType()
@@ -19481,9 +19114,10 @@
 	EReference getXhtmlEditType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getI()
 	 * @see #getXhtmlEditType()
@@ -19492,9 +19126,10 @@
 	EReference getXhtmlEditType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getB()
 	 * @see #getXhtmlEditType()
@@ -19503,9 +19138,10 @@
 	EReference getXhtmlEditType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getBig()
 	 * @see #getXhtmlEditType()
@@ -19514,9 +19150,10 @@
 	EReference getXhtmlEditType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSmall()
 	 * @see #getXhtmlEditType()
@@ -19525,9 +19162,10 @@
 	EReference getXhtmlEditType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSub()
 	 * @see #getXhtmlEditType()
@@ -19536,9 +19174,10 @@
 	EReference getXhtmlEditType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSup()
 	 * @see #getXhtmlEditType()
@@ -19547,9 +19186,10 @@
 	EReference getXhtmlEditType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getA()
 	 * @see #getXhtmlEditType()
@@ -19558,9 +19198,10 @@
 	EReference getXhtmlEditType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getObject()
 	 * @see #getXhtmlEditType()
@@ -19569,9 +19210,10 @@
 	EReference getXhtmlEditType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getIns()
 	 * @see #getXhtmlEditType()
@@ -19580,9 +19222,10 @@
 	EReference getXhtmlEditType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDel()
 	 * @see #getXhtmlEditType()
@@ -19591,9 +19234,9 @@
 	EReference getXhtmlEditType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getCite1 <em>Cite1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getCite1
+	 * <em>Cite1</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Cite1</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getCite1()
 	 * @see #getXhtmlEditType()
@@ -19602,9 +19245,9 @@
 	EAttribute getXhtmlEditType_Cite1();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getClass_()
 	 * @see #getXhtmlEditType()
@@ -19613,9 +19256,9 @@
 	EAttribute getXhtmlEditType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDatetime <em>Datetime</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDatetime
+	 * <em>Datetime</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Datetime</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getDatetime()
 	 * @see #getXhtmlEditType()
@@ -19624,9 +19267,9 @@
 	EAttribute getXhtmlEditType_Datetime();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getId <em>Id</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getId()
 	 * @see #getXhtmlEditType()
@@ -19635,9 +19278,9 @@
 	EAttribute getXhtmlEditType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getLang()
 	 * @see #getXhtmlEditType()
@@ -19646,9 +19289,9 @@
 	EAttribute getXhtmlEditType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getSpace()
 	 * @see #getXhtmlEditType()
@@ -19657,9 +19300,9 @@
 	EAttribute getXhtmlEditType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getStyle()
 	 * @see #getXhtmlEditType()
@@ -19668,9 +19311,9 @@
 	EAttribute getXhtmlEditType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType#getTitle()
 	 * @see #getXhtmlEditType()
@@ -19679,9 +19322,9 @@
 	EAttribute getXhtmlEditType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType <em>Em Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType <em>Em Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Em Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType
 	 * @generated
@@ -19689,9 +19332,9 @@
 	EClass getXhtmlEmType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getMixed()
 	 * @see #getXhtmlEmType()
@@ -19700,9 +19343,10 @@
 	EAttribute getXhtmlEmType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getXhtmlInlineMix()
 	 * @see #getXhtmlEmType()
@@ -19711,9 +19355,10 @@
 	EAttribute getXhtmlEmType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getBr()
 	 * @see #getXhtmlEmType()
@@ -19722,9 +19367,10 @@
 	EReference getXhtmlEmType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSpan()
 	 * @see #getXhtmlEmType()
@@ -19733,9 +19379,10 @@
 	EReference getXhtmlEmType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getEm()
 	 * @see #getXhtmlEmType()
@@ -19744,9 +19391,10 @@
 	EReference getXhtmlEmType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getStrong()
 	 * @see #getXhtmlEmType()
@@ -19755,9 +19403,10 @@
 	EReference getXhtmlEmType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getDfn()
 	 * @see #getXhtmlEmType()
@@ -19766,9 +19415,10 @@
 	EReference getXhtmlEmType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getCode()
 	 * @see #getXhtmlEmType()
@@ -19777,9 +19427,10 @@
 	EReference getXhtmlEmType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSamp()
 	 * @see #getXhtmlEmType()
@@ -19788,9 +19439,10 @@
 	EReference getXhtmlEmType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getKbd()
 	 * @see #getXhtmlEmType()
@@ -19799,9 +19451,10 @@
 	EReference getXhtmlEmType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getVar()
 	 * @see #getXhtmlEmType()
@@ -19810,9 +19463,10 @@
 	EReference getXhtmlEmType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getCite()
 	 * @see #getXhtmlEmType()
@@ -19821,9 +19475,10 @@
 	EReference getXhtmlEmType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getAbbr()
 	 * @see #getXhtmlEmType()
@@ -19832,9 +19487,10 @@
 	EReference getXhtmlEmType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getAcronym()
 	 * @see #getXhtmlEmType()
@@ -19843,9 +19499,9 @@
 	EReference getXhtmlEmType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getQ()
 	 * @see #getXhtmlEmType()
@@ -19854,9 +19510,10 @@
 	EReference getXhtmlEmType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getTt()
 	 * @see #getXhtmlEmType()
@@ -19865,9 +19522,9 @@
 	EReference getXhtmlEmType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getI()
 	 * @see #getXhtmlEmType()
@@ -19876,9 +19533,9 @@
 	EReference getXhtmlEmType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getB()
 	 * @see #getXhtmlEmType()
@@ -19887,9 +19544,10 @@
 	EReference getXhtmlEmType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getBig()
 	 * @see #getXhtmlEmType()
@@ -19898,9 +19556,10 @@
 	EReference getXhtmlEmType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSmall()
 	 * @see #getXhtmlEmType()
@@ -19909,9 +19568,10 @@
 	EReference getXhtmlEmType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSub()
 	 * @see #getXhtmlEmType()
@@ -19920,9 +19580,10 @@
 	EReference getXhtmlEmType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSup()
 	 * @see #getXhtmlEmType()
@@ -19931,9 +19592,9 @@
 	EReference getXhtmlEmType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getA()
 	 * @see #getXhtmlEmType()
@@ -19942,9 +19603,10 @@
 	EReference getXhtmlEmType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getObject()
 	 * @see #getXhtmlEmType()
@@ -19953,9 +19615,10 @@
 	EReference getXhtmlEmType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getIns()
 	 * @see #getXhtmlEmType()
@@ -19964,9 +19627,10 @@
 	EReference getXhtmlEmType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getDel()
 	 * @see #getXhtmlEmType()
@@ -19975,9 +19639,9 @@
 	EReference getXhtmlEmType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getClass_()
 	 * @see #getXhtmlEmType()
@@ -19987,8 +19651,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getId()
 	 * @see #getXhtmlEmType()
@@ -19997,9 +19661,9 @@
 	EAttribute getXhtmlEmType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getLang()
 	 * @see #getXhtmlEmType()
@@ -20008,9 +19672,9 @@
 	EAttribute getXhtmlEmType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getSpace()
 	 * @see #getXhtmlEmType()
@@ -20019,9 +19683,9 @@
 	EAttribute getXhtmlEmType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getStyle()
 	 * @see #getXhtmlEmType()
@@ -20030,9 +19694,9 @@
 	EAttribute getXhtmlEmType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType#getTitle()
 	 * @see #getXhtmlEmType()
@@ -20041,9 +19705,9 @@
 	EAttribute getXhtmlEmType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type <em>H1 Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type <em>H1 Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>H1 Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type
 	 * @generated
@@ -20051,9 +19715,9 @@
 	EClass getXhtmlH1Type();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getMixed()
 	 * @see #getXhtmlH1Type()
@@ -20062,9 +19726,10 @@
 	EAttribute getXhtmlH1Type_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getXhtmlInlineMix()
 	 * @see #getXhtmlH1Type()
@@ -20073,9 +19738,10 @@
 	EAttribute getXhtmlH1Type_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getBr()
 	 * @see #getXhtmlH1Type()
@@ -20084,9 +19750,10 @@
 	EReference getXhtmlH1Type_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSpan()
 	 * @see #getXhtmlH1Type()
@@ -20095,9 +19762,10 @@
 	EReference getXhtmlH1Type_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getEm()
 	 * @see #getXhtmlH1Type()
@@ -20106,9 +19774,10 @@
 	EReference getXhtmlH1Type_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getStrong()
 	 * @see #getXhtmlH1Type()
@@ -20117,9 +19786,10 @@
 	EReference getXhtmlH1Type_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getDfn()
 	 * @see #getXhtmlH1Type()
@@ -20128,9 +19798,10 @@
 	EReference getXhtmlH1Type_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getCode()
 	 * @see #getXhtmlH1Type()
@@ -20139,9 +19810,10 @@
 	EReference getXhtmlH1Type_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSamp()
 	 * @see #getXhtmlH1Type()
@@ -20150,9 +19822,10 @@
 	EReference getXhtmlH1Type_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getKbd()
 	 * @see #getXhtmlH1Type()
@@ -20161,9 +19834,10 @@
 	EReference getXhtmlH1Type_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getVar()
 	 * @see #getXhtmlH1Type()
@@ -20172,9 +19846,10 @@
 	EReference getXhtmlH1Type_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getCite()
 	 * @see #getXhtmlH1Type()
@@ -20183,9 +19858,10 @@
 	EReference getXhtmlH1Type_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getAbbr()
 	 * @see #getXhtmlH1Type()
@@ -20194,9 +19870,10 @@
 	EReference getXhtmlH1Type_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getAcronym()
 	 * @see #getXhtmlH1Type()
@@ -20205,9 +19882,9 @@
 	EReference getXhtmlH1Type_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getQ()
 	 * @see #getXhtmlH1Type()
@@ -20216,9 +19893,10 @@
 	EReference getXhtmlH1Type_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getTt()
 	 * @see #getXhtmlH1Type()
@@ -20227,9 +19905,9 @@
 	EReference getXhtmlH1Type_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getI()
 	 * @see #getXhtmlH1Type()
@@ -20238,9 +19916,9 @@
 	EReference getXhtmlH1Type_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getB()
 	 * @see #getXhtmlH1Type()
@@ -20249,9 +19927,10 @@
 	EReference getXhtmlH1Type_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getBig()
 	 * @see #getXhtmlH1Type()
@@ -20260,9 +19939,10 @@
 	EReference getXhtmlH1Type_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSmall()
 	 * @see #getXhtmlH1Type()
@@ -20271,9 +19951,10 @@
 	EReference getXhtmlH1Type_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSub()
 	 * @see #getXhtmlH1Type()
@@ -20282,9 +19963,10 @@
 	EReference getXhtmlH1Type_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSup()
 	 * @see #getXhtmlH1Type()
@@ -20293,9 +19975,9 @@
 	EReference getXhtmlH1Type_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getA()
 	 * @see #getXhtmlH1Type()
@@ -20304,9 +19986,10 @@
 	EReference getXhtmlH1Type_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getObject()
 	 * @see #getXhtmlH1Type()
@@ -20315,9 +19998,10 @@
 	EReference getXhtmlH1Type_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getIns()
 	 * @see #getXhtmlH1Type()
@@ -20326,9 +20010,10 @@
 	EReference getXhtmlH1Type_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getDel()
 	 * @see #getXhtmlH1Type()
@@ -20337,9 +20022,9 @@
 	EReference getXhtmlH1Type_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getClass_()
 	 * @see #getXhtmlH1Type()
@@ -20349,8 +20034,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getId()
 	 * @see #getXhtmlH1Type()
@@ -20359,9 +20044,9 @@
 	EAttribute getXhtmlH1Type_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getLang()
 	 * @see #getXhtmlH1Type()
@@ -20370,9 +20055,9 @@
 	EAttribute getXhtmlH1Type_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getSpace()
 	 * @see #getXhtmlH1Type()
@@ -20381,9 +20066,9 @@
 	EAttribute getXhtmlH1Type_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getStyle()
 	 * @see #getXhtmlH1Type()
@@ -20392,9 +20077,9 @@
 	EAttribute getXhtmlH1Type_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type#getTitle()
 	 * @see #getXhtmlH1Type()
@@ -20403,9 +20088,9 @@
 	EAttribute getXhtmlH1Type_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type <em>H2 Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type <em>H2 Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>H2 Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type
 	 * @generated
@@ -20413,9 +20098,9 @@
 	EClass getXhtmlH2Type();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getMixed()
 	 * @see #getXhtmlH2Type()
@@ -20424,9 +20109,10 @@
 	EAttribute getXhtmlH2Type_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getXhtmlInlineMix()
 	 * @see #getXhtmlH2Type()
@@ -20435,9 +20121,10 @@
 	EAttribute getXhtmlH2Type_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getBr()
 	 * @see #getXhtmlH2Type()
@@ -20446,9 +20133,10 @@
 	EReference getXhtmlH2Type_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSpan()
 	 * @see #getXhtmlH2Type()
@@ -20457,9 +20145,10 @@
 	EReference getXhtmlH2Type_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getEm()
 	 * @see #getXhtmlH2Type()
@@ -20468,9 +20157,10 @@
 	EReference getXhtmlH2Type_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getStrong()
 	 * @see #getXhtmlH2Type()
@@ -20479,9 +20169,10 @@
 	EReference getXhtmlH2Type_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getDfn()
 	 * @see #getXhtmlH2Type()
@@ -20490,9 +20181,10 @@
 	EReference getXhtmlH2Type_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getCode()
 	 * @see #getXhtmlH2Type()
@@ -20501,9 +20193,10 @@
 	EReference getXhtmlH2Type_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSamp()
 	 * @see #getXhtmlH2Type()
@@ -20512,9 +20205,10 @@
 	EReference getXhtmlH2Type_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getKbd()
 	 * @see #getXhtmlH2Type()
@@ -20523,9 +20217,10 @@
 	EReference getXhtmlH2Type_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getVar()
 	 * @see #getXhtmlH2Type()
@@ -20534,9 +20229,10 @@
 	EReference getXhtmlH2Type_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getCite()
 	 * @see #getXhtmlH2Type()
@@ -20545,9 +20241,10 @@
 	EReference getXhtmlH2Type_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getAbbr()
 	 * @see #getXhtmlH2Type()
@@ -20556,9 +20253,10 @@
 	EReference getXhtmlH2Type_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getAcronym()
 	 * @see #getXhtmlH2Type()
@@ -20567,9 +20265,9 @@
 	EReference getXhtmlH2Type_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getQ()
 	 * @see #getXhtmlH2Type()
@@ -20578,9 +20276,10 @@
 	EReference getXhtmlH2Type_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getTt()
 	 * @see #getXhtmlH2Type()
@@ -20589,9 +20288,9 @@
 	EReference getXhtmlH2Type_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getI()
 	 * @see #getXhtmlH2Type()
@@ -20600,9 +20299,9 @@
 	EReference getXhtmlH2Type_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getB()
 	 * @see #getXhtmlH2Type()
@@ -20611,9 +20310,10 @@
 	EReference getXhtmlH2Type_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getBig()
 	 * @see #getXhtmlH2Type()
@@ -20622,9 +20322,10 @@
 	EReference getXhtmlH2Type_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSmall()
 	 * @see #getXhtmlH2Type()
@@ -20633,9 +20334,10 @@
 	EReference getXhtmlH2Type_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSub()
 	 * @see #getXhtmlH2Type()
@@ -20644,9 +20346,10 @@
 	EReference getXhtmlH2Type_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSup()
 	 * @see #getXhtmlH2Type()
@@ -20655,9 +20358,9 @@
 	EReference getXhtmlH2Type_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getA()
 	 * @see #getXhtmlH2Type()
@@ -20666,9 +20369,10 @@
 	EReference getXhtmlH2Type_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getObject()
 	 * @see #getXhtmlH2Type()
@@ -20677,9 +20381,10 @@
 	EReference getXhtmlH2Type_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getIns()
 	 * @see #getXhtmlH2Type()
@@ -20688,9 +20393,10 @@
 	EReference getXhtmlH2Type_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getDel()
 	 * @see #getXhtmlH2Type()
@@ -20699,9 +20405,9 @@
 	EReference getXhtmlH2Type_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getClass_()
 	 * @see #getXhtmlH2Type()
@@ -20711,8 +20417,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getId()
 	 * @see #getXhtmlH2Type()
@@ -20721,9 +20427,9 @@
 	EAttribute getXhtmlH2Type_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getLang()
 	 * @see #getXhtmlH2Type()
@@ -20732,9 +20438,9 @@
 	EAttribute getXhtmlH2Type_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getSpace()
 	 * @see #getXhtmlH2Type()
@@ -20743,9 +20449,9 @@
 	EAttribute getXhtmlH2Type_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getStyle()
 	 * @see #getXhtmlH2Type()
@@ -20754,9 +20460,9 @@
 	EAttribute getXhtmlH2Type_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type#getTitle()
 	 * @see #getXhtmlH2Type()
@@ -20765,9 +20471,9 @@
 	EAttribute getXhtmlH2Type_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type <em>H3 Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type <em>H3 Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>H3 Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type
 	 * @generated
@@ -20775,9 +20481,9 @@
 	EClass getXhtmlH3Type();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getMixed()
 	 * @see #getXhtmlH3Type()
@@ -20786,9 +20492,10 @@
 	EAttribute getXhtmlH3Type_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getXhtmlInlineMix()
 	 * @see #getXhtmlH3Type()
@@ -20797,9 +20504,10 @@
 	EAttribute getXhtmlH3Type_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getBr()
 	 * @see #getXhtmlH3Type()
@@ -20808,9 +20516,10 @@
 	EReference getXhtmlH3Type_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSpan()
 	 * @see #getXhtmlH3Type()
@@ -20819,9 +20528,10 @@
 	EReference getXhtmlH3Type_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getEm()
 	 * @see #getXhtmlH3Type()
@@ -20830,9 +20540,10 @@
 	EReference getXhtmlH3Type_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getStrong()
 	 * @see #getXhtmlH3Type()
@@ -20841,9 +20552,10 @@
 	EReference getXhtmlH3Type_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getDfn()
 	 * @see #getXhtmlH3Type()
@@ -20852,9 +20564,10 @@
 	EReference getXhtmlH3Type_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getCode()
 	 * @see #getXhtmlH3Type()
@@ -20863,9 +20576,10 @@
 	EReference getXhtmlH3Type_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSamp()
 	 * @see #getXhtmlH3Type()
@@ -20874,9 +20588,10 @@
 	EReference getXhtmlH3Type_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getKbd()
 	 * @see #getXhtmlH3Type()
@@ -20885,9 +20600,10 @@
 	EReference getXhtmlH3Type_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getVar()
 	 * @see #getXhtmlH3Type()
@@ -20896,9 +20612,10 @@
 	EReference getXhtmlH3Type_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getCite()
 	 * @see #getXhtmlH3Type()
@@ -20907,9 +20624,10 @@
 	EReference getXhtmlH3Type_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getAbbr()
 	 * @see #getXhtmlH3Type()
@@ -20918,9 +20636,10 @@
 	EReference getXhtmlH3Type_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getAcronym()
 	 * @see #getXhtmlH3Type()
@@ -20929,9 +20648,9 @@
 	EReference getXhtmlH3Type_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getQ()
 	 * @see #getXhtmlH3Type()
@@ -20940,9 +20659,10 @@
 	EReference getXhtmlH3Type_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getTt()
 	 * @see #getXhtmlH3Type()
@@ -20951,9 +20671,9 @@
 	EReference getXhtmlH3Type_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getI()
 	 * @see #getXhtmlH3Type()
@@ -20962,9 +20682,9 @@
 	EReference getXhtmlH3Type_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getB()
 	 * @see #getXhtmlH3Type()
@@ -20973,9 +20693,10 @@
 	EReference getXhtmlH3Type_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getBig()
 	 * @see #getXhtmlH3Type()
@@ -20984,9 +20705,10 @@
 	EReference getXhtmlH3Type_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSmall()
 	 * @see #getXhtmlH3Type()
@@ -20995,9 +20717,10 @@
 	EReference getXhtmlH3Type_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSub()
 	 * @see #getXhtmlH3Type()
@@ -21006,9 +20729,10 @@
 	EReference getXhtmlH3Type_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSup()
 	 * @see #getXhtmlH3Type()
@@ -21017,9 +20741,9 @@
 	EReference getXhtmlH3Type_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getA()
 	 * @see #getXhtmlH3Type()
@@ -21028,9 +20752,10 @@
 	EReference getXhtmlH3Type_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getObject()
 	 * @see #getXhtmlH3Type()
@@ -21039,9 +20764,10 @@
 	EReference getXhtmlH3Type_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getIns()
 	 * @see #getXhtmlH3Type()
@@ -21050,9 +20776,10 @@
 	EReference getXhtmlH3Type_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getDel()
 	 * @see #getXhtmlH3Type()
@@ -21061,9 +20788,9 @@
 	EReference getXhtmlH3Type_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getClass_()
 	 * @see #getXhtmlH3Type()
@@ -21073,8 +20800,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getId()
 	 * @see #getXhtmlH3Type()
@@ -21083,9 +20810,9 @@
 	EAttribute getXhtmlH3Type_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getLang()
 	 * @see #getXhtmlH3Type()
@@ -21094,9 +20821,9 @@
 	EAttribute getXhtmlH3Type_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getSpace()
 	 * @see #getXhtmlH3Type()
@@ -21105,9 +20832,9 @@
 	EAttribute getXhtmlH3Type_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getStyle()
 	 * @see #getXhtmlH3Type()
@@ -21116,9 +20843,9 @@
 	EAttribute getXhtmlH3Type_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type#getTitle()
 	 * @see #getXhtmlH3Type()
@@ -21127,9 +20854,9 @@
 	EAttribute getXhtmlH3Type_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type <em>H4 Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type <em>H4 Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>H4 Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type
 	 * @generated
@@ -21137,9 +20864,9 @@
 	EClass getXhtmlH4Type();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getMixed()
 	 * @see #getXhtmlH4Type()
@@ -21148,9 +20875,10 @@
 	EAttribute getXhtmlH4Type_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getXhtmlInlineMix()
 	 * @see #getXhtmlH4Type()
@@ -21159,9 +20887,10 @@
 	EAttribute getXhtmlH4Type_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getBr()
 	 * @see #getXhtmlH4Type()
@@ -21170,9 +20899,10 @@
 	EReference getXhtmlH4Type_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSpan()
 	 * @see #getXhtmlH4Type()
@@ -21181,9 +20911,10 @@
 	EReference getXhtmlH4Type_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getEm()
 	 * @see #getXhtmlH4Type()
@@ -21192,9 +20923,10 @@
 	EReference getXhtmlH4Type_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getStrong()
 	 * @see #getXhtmlH4Type()
@@ -21203,9 +20935,10 @@
 	EReference getXhtmlH4Type_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getDfn()
 	 * @see #getXhtmlH4Type()
@@ -21214,9 +20947,10 @@
 	EReference getXhtmlH4Type_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getCode()
 	 * @see #getXhtmlH4Type()
@@ -21225,9 +20959,10 @@
 	EReference getXhtmlH4Type_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSamp()
 	 * @see #getXhtmlH4Type()
@@ -21236,9 +20971,10 @@
 	EReference getXhtmlH4Type_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getKbd()
 	 * @see #getXhtmlH4Type()
@@ -21247,9 +20983,10 @@
 	EReference getXhtmlH4Type_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getVar()
 	 * @see #getXhtmlH4Type()
@@ -21258,9 +20995,10 @@
 	EReference getXhtmlH4Type_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getCite()
 	 * @see #getXhtmlH4Type()
@@ -21269,9 +21007,10 @@
 	EReference getXhtmlH4Type_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getAbbr()
 	 * @see #getXhtmlH4Type()
@@ -21280,9 +21019,10 @@
 	EReference getXhtmlH4Type_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getAcronym()
 	 * @see #getXhtmlH4Type()
@@ -21291,9 +21031,9 @@
 	EReference getXhtmlH4Type_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getQ()
 	 * @see #getXhtmlH4Type()
@@ -21302,9 +21042,10 @@
 	EReference getXhtmlH4Type_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getTt()
 	 * @see #getXhtmlH4Type()
@@ -21313,9 +21054,9 @@
 	EReference getXhtmlH4Type_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getI()
 	 * @see #getXhtmlH4Type()
@@ -21324,9 +21065,9 @@
 	EReference getXhtmlH4Type_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getB()
 	 * @see #getXhtmlH4Type()
@@ -21335,9 +21076,10 @@
 	EReference getXhtmlH4Type_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getBig()
 	 * @see #getXhtmlH4Type()
@@ -21346,9 +21088,10 @@
 	EReference getXhtmlH4Type_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSmall()
 	 * @see #getXhtmlH4Type()
@@ -21357,9 +21100,10 @@
 	EReference getXhtmlH4Type_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSub()
 	 * @see #getXhtmlH4Type()
@@ -21368,9 +21112,10 @@
 	EReference getXhtmlH4Type_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSup()
 	 * @see #getXhtmlH4Type()
@@ -21379,9 +21124,9 @@
 	EReference getXhtmlH4Type_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getA()
 	 * @see #getXhtmlH4Type()
@@ -21390,9 +21135,10 @@
 	EReference getXhtmlH4Type_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getObject()
 	 * @see #getXhtmlH4Type()
@@ -21401,9 +21147,10 @@
 	EReference getXhtmlH4Type_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getIns()
 	 * @see #getXhtmlH4Type()
@@ -21412,9 +21159,10 @@
 	EReference getXhtmlH4Type_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getDel()
 	 * @see #getXhtmlH4Type()
@@ -21423,9 +21171,9 @@
 	EReference getXhtmlH4Type_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getClass_()
 	 * @see #getXhtmlH4Type()
@@ -21435,8 +21183,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getId()
 	 * @see #getXhtmlH4Type()
@@ -21445,9 +21193,9 @@
 	EAttribute getXhtmlH4Type_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getLang()
 	 * @see #getXhtmlH4Type()
@@ -21456,9 +21204,9 @@
 	EAttribute getXhtmlH4Type_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getSpace()
 	 * @see #getXhtmlH4Type()
@@ -21467,9 +21215,9 @@
 	EAttribute getXhtmlH4Type_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getStyle()
 	 * @see #getXhtmlH4Type()
@@ -21478,9 +21226,9 @@
 	EAttribute getXhtmlH4Type_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type#getTitle()
 	 * @see #getXhtmlH4Type()
@@ -21489,9 +21237,9 @@
 	EAttribute getXhtmlH4Type_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type <em>H5 Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type <em>H5 Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>H5 Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type
 	 * @generated
@@ -21499,9 +21247,9 @@
 	EClass getXhtmlH5Type();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getMixed()
 	 * @see #getXhtmlH5Type()
@@ -21510,9 +21258,10 @@
 	EAttribute getXhtmlH5Type_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getXhtmlInlineMix()
 	 * @see #getXhtmlH5Type()
@@ -21521,9 +21270,10 @@
 	EAttribute getXhtmlH5Type_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getBr()
 	 * @see #getXhtmlH5Type()
@@ -21532,9 +21282,10 @@
 	EReference getXhtmlH5Type_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSpan()
 	 * @see #getXhtmlH5Type()
@@ -21543,9 +21294,10 @@
 	EReference getXhtmlH5Type_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getEm()
 	 * @see #getXhtmlH5Type()
@@ -21554,9 +21306,10 @@
 	EReference getXhtmlH5Type_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getStrong()
 	 * @see #getXhtmlH5Type()
@@ -21565,9 +21318,10 @@
 	EReference getXhtmlH5Type_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getDfn()
 	 * @see #getXhtmlH5Type()
@@ -21576,9 +21330,10 @@
 	EReference getXhtmlH5Type_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getCode()
 	 * @see #getXhtmlH5Type()
@@ -21587,9 +21342,10 @@
 	EReference getXhtmlH5Type_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSamp()
 	 * @see #getXhtmlH5Type()
@@ -21598,9 +21354,10 @@
 	EReference getXhtmlH5Type_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getKbd()
 	 * @see #getXhtmlH5Type()
@@ -21609,9 +21366,10 @@
 	EReference getXhtmlH5Type_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getVar()
 	 * @see #getXhtmlH5Type()
@@ -21620,9 +21378,10 @@
 	EReference getXhtmlH5Type_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getCite()
 	 * @see #getXhtmlH5Type()
@@ -21631,9 +21390,10 @@
 	EReference getXhtmlH5Type_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getAbbr()
 	 * @see #getXhtmlH5Type()
@@ -21642,9 +21402,10 @@
 	EReference getXhtmlH5Type_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getAcronym()
 	 * @see #getXhtmlH5Type()
@@ -21653,9 +21414,9 @@
 	EReference getXhtmlH5Type_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getQ()
 	 * @see #getXhtmlH5Type()
@@ -21664,9 +21425,10 @@
 	EReference getXhtmlH5Type_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getTt()
 	 * @see #getXhtmlH5Type()
@@ -21675,9 +21437,9 @@
 	EReference getXhtmlH5Type_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getI()
 	 * @see #getXhtmlH5Type()
@@ -21686,9 +21448,9 @@
 	EReference getXhtmlH5Type_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getB()
 	 * @see #getXhtmlH5Type()
@@ -21697,9 +21459,10 @@
 	EReference getXhtmlH5Type_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getBig()
 	 * @see #getXhtmlH5Type()
@@ -21708,9 +21471,10 @@
 	EReference getXhtmlH5Type_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSmall()
 	 * @see #getXhtmlH5Type()
@@ -21719,9 +21483,10 @@
 	EReference getXhtmlH5Type_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSub()
 	 * @see #getXhtmlH5Type()
@@ -21730,9 +21495,10 @@
 	EReference getXhtmlH5Type_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSup()
 	 * @see #getXhtmlH5Type()
@@ -21741,9 +21507,9 @@
 	EReference getXhtmlH5Type_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getA()
 	 * @see #getXhtmlH5Type()
@@ -21752,9 +21518,10 @@
 	EReference getXhtmlH5Type_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getObject()
 	 * @see #getXhtmlH5Type()
@@ -21763,9 +21530,10 @@
 	EReference getXhtmlH5Type_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getIns()
 	 * @see #getXhtmlH5Type()
@@ -21774,9 +21542,10 @@
 	EReference getXhtmlH5Type_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getDel()
 	 * @see #getXhtmlH5Type()
@@ -21785,9 +21554,9 @@
 	EReference getXhtmlH5Type_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getClass_()
 	 * @see #getXhtmlH5Type()
@@ -21797,8 +21566,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getId()
 	 * @see #getXhtmlH5Type()
@@ -21807,9 +21576,9 @@
 	EAttribute getXhtmlH5Type_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getLang()
 	 * @see #getXhtmlH5Type()
@@ -21818,9 +21587,9 @@
 	EAttribute getXhtmlH5Type_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getSpace()
 	 * @see #getXhtmlH5Type()
@@ -21829,9 +21598,9 @@
 	EAttribute getXhtmlH5Type_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getStyle()
 	 * @see #getXhtmlH5Type()
@@ -21840,9 +21609,9 @@
 	EAttribute getXhtmlH5Type_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type#getTitle()
 	 * @see #getXhtmlH5Type()
@@ -21851,9 +21620,9 @@
 	EAttribute getXhtmlH5Type_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type <em>H6 Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type <em>H6 Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>H6 Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type
 	 * @generated
@@ -21861,9 +21630,9 @@
 	EClass getXhtmlH6Type();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getMixed()
 	 * @see #getXhtmlH6Type()
@@ -21872,9 +21641,10 @@
 	EAttribute getXhtmlH6Type_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getXhtmlInlineMix()
 	 * @see #getXhtmlH6Type()
@@ -21883,9 +21653,10 @@
 	EAttribute getXhtmlH6Type_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getBr()
 	 * @see #getXhtmlH6Type()
@@ -21894,9 +21665,10 @@
 	EReference getXhtmlH6Type_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSpan()
 	 * @see #getXhtmlH6Type()
@@ -21905,9 +21677,10 @@
 	EReference getXhtmlH6Type_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getEm()
 	 * @see #getXhtmlH6Type()
@@ -21916,9 +21689,10 @@
 	EReference getXhtmlH6Type_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getStrong()
 	 * @see #getXhtmlH6Type()
@@ -21927,9 +21701,10 @@
 	EReference getXhtmlH6Type_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getDfn()
 	 * @see #getXhtmlH6Type()
@@ -21938,9 +21713,10 @@
 	EReference getXhtmlH6Type_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getCode()
 	 * @see #getXhtmlH6Type()
@@ -21949,9 +21725,10 @@
 	EReference getXhtmlH6Type_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSamp()
 	 * @see #getXhtmlH6Type()
@@ -21960,9 +21737,10 @@
 	EReference getXhtmlH6Type_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getKbd()
 	 * @see #getXhtmlH6Type()
@@ -21971,9 +21749,10 @@
 	EReference getXhtmlH6Type_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getVar()
 	 * @see #getXhtmlH6Type()
@@ -21982,9 +21761,10 @@
 	EReference getXhtmlH6Type_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getCite()
 	 * @see #getXhtmlH6Type()
@@ -21993,9 +21773,10 @@
 	EReference getXhtmlH6Type_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getAbbr()
 	 * @see #getXhtmlH6Type()
@@ -22004,9 +21785,10 @@
 	EReference getXhtmlH6Type_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getAcronym()
 	 * @see #getXhtmlH6Type()
@@ -22015,9 +21797,9 @@
 	EReference getXhtmlH6Type_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getQ()
 	 * @see #getXhtmlH6Type()
@@ -22026,9 +21808,10 @@
 	EReference getXhtmlH6Type_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getTt()
 	 * @see #getXhtmlH6Type()
@@ -22037,9 +21820,9 @@
 	EReference getXhtmlH6Type_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getI()
 	 * @see #getXhtmlH6Type()
@@ -22048,9 +21831,9 @@
 	EReference getXhtmlH6Type_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getB()
 	 * @see #getXhtmlH6Type()
@@ -22059,9 +21842,10 @@
 	EReference getXhtmlH6Type_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getBig()
 	 * @see #getXhtmlH6Type()
@@ -22070,9 +21854,10 @@
 	EReference getXhtmlH6Type_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSmall()
 	 * @see #getXhtmlH6Type()
@@ -22081,9 +21866,10 @@
 	EReference getXhtmlH6Type_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSub()
 	 * @see #getXhtmlH6Type()
@@ -22092,9 +21878,10 @@
 	EReference getXhtmlH6Type_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSup()
 	 * @see #getXhtmlH6Type()
@@ -22103,9 +21890,9 @@
 	EReference getXhtmlH6Type_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getA()
 	 * @see #getXhtmlH6Type()
@@ -22114,9 +21901,10 @@
 	EReference getXhtmlH6Type_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getObject()
 	 * @see #getXhtmlH6Type()
@@ -22125,9 +21913,10 @@
 	EReference getXhtmlH6Type_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getIns()
 	 * @see #getXhtmlH6Type()
@@ -22136,9 +21925,10 @@
 	EReference getXhtmlH6Type_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getDel()
 	 * @see #getXhtmlH6Type()
@@ -22147,9 +21937,9 @@
 	EReference getXhtmlH6Type_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getClass_()
 	 * @see #getXhtmlH6Type()
@@ -22159,8 +21949,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getId()
 	 * @see #getXhtmlH6Type()
@@ -22169,9 +21959,9 @@
 	EAttribute getXhtmlH6Type_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getLang()
 	 * @see #getXhtmlH6Type()
@@ -22180,9 +21970,9 @@
 	EAttribute getXhtmlH6Type_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getSpace()
 	 * @see #getXhtmlH6Type()
@@ -22191,9 +21981,9 @@
 	EAttribute getXhtmlH6Type_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getStyle()
 	 * @see #getXhtmlH6Type()
@@ -22202,9 +21992,9 @@
 	EAttribute getXhtmlH6Type_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type#getTitle()
 	 * @see #getXhtmlH6Type()
@@ -22214,8 +22004,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType <em>Heading Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Heading Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType
 	 * @generated
@@ -22223,9 +22013,9 @@
 	EClass getXhtmlHeadingType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getMixed()
 	 * @see #getXhtmlHeadingType()
@@ -22234,9 +22024,10 @@
 	EAttribute getXhtmlHeadingType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getXhtmlInlineMix()
 	 * @see #getXhtmlHeadingType()
@@ -22245,9 +22036,10 @@
 	EAttribute getXhtmlHeadingType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getBr()
 	 * @see #getXhtmlHeadingType()
@@ -22256,9 +22048,10 @@
 	EReference getXhtmlHeadingType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSpan()
 	 * @see #getXhtmlHeadingType()
@@ -22267,9 +22060,10 @@
 	EReference getXhtmlHeadingType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getEm()
 	 * @see #getXhtmlHeadingType()
@@ -22278,9 +22072,10 @@
 	EReference getXhtmlHeadingType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getStrong()
 	 * @see #getXhtmlHeadingType()
@@ -22289,9 +22084,10 @@
 	EReference getXhtmlHeadingType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getDfn()
 	 * @see #getXhtmlHeadingType()
@@ -22300,9 +22096,10 @@
 	EReference getXhtmlHeadingType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getCode()
 	 * @see #getXhtmlHeadingType()
@@ -22311,9 +22108,10 @@
 	EReference getXhtmlHeadingType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSamp()
 	 * @see #getXhtmlHeadingType()
@@ -22322,9 +22120,10 @@
 	EReference getXhtmlHeadingType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getKbd()
 	 * @see #getXhtmlHeadingType()
@@ -22333,9 +22132,10 @@
 	EReference getXhtmlHeadingType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getVar()
 	 * @see #getXhtmlHeadingType()
@@ -22344,9 +22144,10 @@
 	EReference getXhtmlHeadingType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getCite()
 	 * @see #getXhtmlHeadingType()
@@ -22355,9 +22156,10 @@
 	EReference getXhtmlHeadingType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getAbbr()
 	 * @see #getXhtmlHeadingType()
@@ -22366,9 +22168,10 @@
 	EReference getXhtmlHeadingType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getAcronym()
 	 * @see #getXhtmlHeadingType()
@@ -22377,9 +22180,10 @@
 	EReference getXhtmlHeadingType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getQ()
 	 * @see #getXhtmlHeadingType()
@@ -22388,9 +22192,10 @@
 	EReference getXhtmlHeadingType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getTt()
 	 * @see #getXhtmlHeadingType()
@@ -22399,9 +22204,10 @@
 	EReference getXhtmlHeadingType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getI <em>I</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getI()
 	 * @see #getXhtmlHeadingType()
@@ -22410,9 +22216,10 @@
 	EReference getXhtmlHeadingType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getB <em>B</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getB()
 	 * @see #getXhtmlHeadingType()
@@ -22421,9 +22228,10 @@
 	EReference getXhtmlHeadingType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getBig()
 	 * @see #getXhtmlHeadingType()
@@ -22432,9 +22240,10 @@
 	EReference getXhtmlHeadingType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSmall()
 	 * @see #getXhtmlHeadingType()
@@ -22443,9 +22252,10 @@
 	EReference getXhtmlHeadingType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSub()
 	 * @see #getXhtmlHeadingType()
@@ -22454,9 +22264,10 @@
 	EReference getXhtmlHeadingType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSup()
 	 * @see #getXhtmlHeadingType()
@@ -22465,9 +22276,10 @@
 	EReference getXhtmlHeadingType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getA <em>A</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getA()
 	 * @see #getXhtmlHeadingType()
@@ -22476,9 +22288,10 @@
 	EReference getXhtmlHeadingType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getObject()
 	 * @see #getXhtmlHeadingType()
@@ -22487,9 +22300,10 @@
 	EReference getXhtmlHeadingType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getIns()
 	 * @see #getXhtmlHeadingType()
@@ -22498,9 +22312,10 @@
 	EReference getXhtmlHeadingType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getDel()
 	 * @see #getXhtmlHeadingType()
@@ -22509,9 +22324,9 @@
 	EReference getXhtmlHeadingType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getClass_()
 	 * @see #getXhtmlHeadingType()
@@ -22520,9 +22335,9 @@
 	EAttribute getXhtmlHeadingType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getId
+	 * <em>Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getId()
 	 * @see #getXhtmlHeadingType()
@@ -22531,9 +22346,9 @@
 	EAttribute getXhtmlHeadingType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getLang()
 	 * @see #getXhtmlHeadingType()
@@ -22542,9 +22357,9 @@
 	EAttribute getXhtmlHeadingType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getSpace()
 	 * @see #getXhtmlHeadingType()
@@ -22553,9 +22368,9 @@
 	EAttribute getXhtmlHeadingType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getStyle()
 	 * @see #getXhtmlHeadingType()
@@ -22564,9 +22379,9 @@
 	EAttribute getXhtmlHeadingType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType#getTitle()
 	 * @see #getXhtmlHeadingType()
@@ -22575,9 +22390,9 @@
 	EAttribute getXhtmlHeadingType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType <em>Hr Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType <em>Hr Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hr Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHrType
 	 * @generated
@@ -22585,9 +22400,9 @@
 	EClass getXhtmlHrType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getClass_()
 	 * @see #getXhtmlHrType()
@@ -22597,8 +22412,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getId()
 	 * @see #getXhtmlHrType()
@@ -22607,9 +22422,9 @@
 	EAttribute getXhtmlHrType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getLang()
 	 * @see #getXhtmlHrType()
@@ -22618,9 +22433,9 @@
 	EAttribute getXhtmlHrType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getSpace()
 	 * @see #getXhtmlHrType()
@@ -22629,9 +22444,9 @@
 	EAttribute getXhtmlHrType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getStyle()
 	 * @see #getXhtmlHrType()
@@ -22640,9 +22455,9 @@
 	EAttribute getXhtmlHrType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHrType#getTitle()
 	 * @see #getXhtmlHrType()
@@ -22651,9 +22466,9 @@
 	EAttribute getXhtmlHrType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType <em>Inl Pres Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType <em>Inl Pres Type</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Inl Pres Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType
 	 * @generated
@@ -22661,9 +22476,9 @@
 	EClass getXhtmlInlPresType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getMixed()
 	 * @see #getXhtmlInlPresType()
@@ -22672,9 +22487,10 @@
 	EAttribute getXhtmlInlPresType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getXhtmlInlineMix()
 	 * @see #getXhtmlInlPresType()
@@ -22683,9 +22499,10 @@
 	EAttribute getXhtmlInlPresType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getBr()
 	 * @see #getXhtmlInlPresType()
@@ -22694,9 +22511,10 @@
 	EReference getXhtmlInlPresType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSpan()
 	 * @see #getXhtmlInlPresType()
@@ -22705,9 +22523,10 @@
 	EReference getXhtmlInlPresType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getEm()
 	 * @see #getXhtmlInlPresType()
@@ -22716,9 +22535,10 @@
 	EReference getXhtmlInlPresType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getStrong()
 	 * @see #getXhtmlInlPresType()
@@ -22727,9 +22547,10 @@
 	EReference getXhtmlInlPresType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getDfn()
 	 * @see #getXhtmlInlPresType()
@@ -22738,9 +22559,10 @@
 	EReference getXhtmlInlPresType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getCode()
 	 * @see #getXhtmlInlPresType()
@@ -22749,9 +22571,10 @@
 	EReference getXhtmlInlPresType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSamp()
 	 * @see #getXhtmlInlPresType()
@@ -22760,9 +22583,10 @@
 	EReference getXhtmlInlPresType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getKbd()
 	 * @see #getXhtmlInlPresType()
@@ -22771,9 +22595,10 @@
 	EReference getXhtmlInlPresType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getVar()
 	 * @see #getXhtmlInlPresType()
@@ -22782,9 +22607,10 @@
 	EReference getXhtmlInlPresType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getCite()
 	 * @see #getXhtmlInlPresType()
@@ -22793,9 +22619,10 @@
 	EReference getXhtmlInlPresType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getAbbr()
 	 * @see #getXhtmlInlPresType()
@@ -22804,9 +22631,10 @@
 	EReference getXhtmlInlPresType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getAcronym()
 	 * @see #getXhtmlInlPresType()
@@ -22815,9 +22643,10 @@
 	EReference getXhtmlInlPresType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getQ()
 	 * @see #getXhtmlInlPresType()
@@ -22826,9 +22655,10 @@
 	EReference getXhtmlInlPresType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getTt()
 	 * @see #getXhtmlInlPresType()
@@ -22837,9 +22667,10 @@
 	EReference getXhtmlInlPresType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getI <em>I</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getI()
 	 * @see #getXhtmlInlPresType()
@@ -22848,9 +22679,10 @@
 	EReference getXhtmlInlPresType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getB <em>B</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getB()
 	 * @see #getXhtmlInlPresType()
@@ -22859,9 +22691,10 @@
 	EReference getXhtmlInlPresType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getBig()
 	 * @see #getXhtmlInlPresType()
@@ -22870,9 +22703,10 @@
 	EReference getXhtmlInlPresType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSmall()
 	 * @see #getXhtmlInlPresType()
@@ -22881,9 +22715,10 @@
 	EReference getXhtmlInlPresType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSub()
 	 * @see #getXhtmlInlPresType()
@@ -22892,9 +22727,10 @@
 	EReference getXhtmlInlPresType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSup()
 	 * @see #getXhtmlInlPresType()
@@ -22903,9 +22739,10 @@
 	EReference getXhtmlInlPresType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getA <em>A</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getA()
 	 * @see #getXhtmlInlPresType()
@@ -22914,9 +22751,10 @@
 	EReference getXhtmlInlPresType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getObject()
 	 * @see #getXhtmlInlPresType()
@@ -22925,9 +22763,10 @@
 	EReference getXhtmlInlPresType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getIns()
 	 * @see #getXhtmlInlPresType()
@@ -22936,9 +22775,10 @@
 	EReference getXhtmlInlPresType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getDel()
 	 * @see #getXhtmlInlPresType()
@@ -22947,9 +22787,9 @@
 	EReference getXhtmlInlPresType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getClass_()
 	 * @see #getXhtmlInlPresType()
@@ -22958,9 +22798,9 @@
 	EAttribute getXhtmlInlPresType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getId
+	 * <em>Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getId()
 	 * @see #getXhtmlInlPresType()
@@ -22969,9 +22809,9 @@
 	EAttribute getXhtmlInlPresType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getLang()
 	 * @see #getXhtmlInlPresType()
@@ -22980,9 +22820,9 @@
 	EAttribute getXhtmlInlPresType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getSpace()
 	 * @see #getXhtmlInlPresType()
@@ -22991,9 +22831,9 @@
 	EAttribute getXhtmlInlPresType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getStyle()
 	 * @see #getXhtmlInlPresType()
@@ -23002,9 +22842,9 @@
 	EAttribute getXhtmlInlPresType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType#getTitle()
 	 * @see #getXhtmlInlPresType()
@@ -23013,9 +22853,9 @@
 	EAttribute getXhtmlInlPresType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType <em>Kbd Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType <em>Kbd Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Kbd Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType
 	 * @generated
@@ -23023,9 +22863,9 @@
 	EClass getXhtmlKbdType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getMixed()
 	 * @see #getXhtmlKbdType()
@@ -23034,9 +22874,10 @@
 	EAttribute getXhtmlKbdType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getXhtmlInlineMix()
 	 * @see #getXhtmlKbdType()
@@ -23045,9 +22886,10 @@
 	EAttribute getXhtmlKbdType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getBr()
 	 * @see #getXhtmlKbdType()
@@ -23056,9 +22898,10 @@
 	EReference getXhtmlKbdType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSpan()
 	 * @see #getXhtmlKbdType()
@@ -23067,9 +22910,10 @@
 	EReference getXhtmlKbdType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getEm()
 	 * @see #getXhtmlKbdType()
@@ -23078,9 +22922,10 @@
 	EReference getXhtmlKbdType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getStrong()
 	 * @see #getXhtmlKbdType()
@@ -23089,9 +22934,10 @@
 	EReference getXhtmlKbdType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getDfn()
 	 * @see #getXhtmlKbdType()
@@ -23100,9 +22946,10 @@
 	EReference getXhtmlKbdType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getCode()
 	 * @see #getXhtmlKbdType()
@@ -23111,9 +22958,10 @@
 	EReference getXhtmlKbdType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSamp()
 	 * @see #getXhtmlKbdType()
@@ -23122,9 +22970,10 @@
 	EReference getXhtmlKbdType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getKbd()
 	 * @see #getXhtmlKbdType()
@@ -23133,9 +22982,10 @@
 	EReference getXhtmlKbdType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getVar()
 	 * @see #getXhtmlKbdType()
@@ -23144,9 +22994,10 @@
 	EReference getXhtmlKbdType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getCite()
 	 * @see #getXhtmlKbdType()
@@ -23155,9 +23006,10 @@
 	EReference getXhtmlKbdType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getAbbr()
 	 * @see #getXhtmlKbdType()
@@ -23166,9 +23018,10 @@
 	EReference getXhtmlKbdType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getAcronym()
 	 * @see #getXhtmlKbdType()
@@ -23177,9 +23030,10 @@
 	EReference getXhtmlKbdType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getQ()
 	 * @see #getXhtmlKbdType()
@@ -23188,9 +23042,10 @@
 	EReference getXhtmlKbdType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getTt()
 	 * @see #getXhtmlKbdType()
@@ -23199,9 +23054,10 @@
 	EReference getXhtmlKbdType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getI()
 	 * @see #getXhtmlKbdType()
@@ -23210,9 +23066,10 @@
 	EReference getXhtmlKbdType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getB()
 	 * @see #getXhtmlKbdType()
@@ -23221,9 +23078,10 @@
 	EReference getXhtmlKbdType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getBig()
 	 * @see #getXhtmlKbdType()
@@ -23232,9 +23090,10 @@
 	EReference getXhtmlKbdType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSmall()
 	 * @see #getXhtmlKbdType()
@@ -23243,9 +23102,10 @@
 	EReference getXhtmlKbdType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSub()
 	 * @see #getXhtmlKbdType()
@@ -23254,9 +23114,10 @@
 	EReference getXhtmlKbdType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSup()
 	 * @see #getXhtmlKbdType()
@@ -23265,9 +23126,10 @@
 	EReference getXhtmlKbdType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getA()
 	 * @see #getXhtmlKbdType()
@@ -23276,9 +23138,10 @@
 	EReference getXhtmlKbdType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getObject()
 	 * @see #getXhtmlKbdType()
@@ -23287,9 +23150,10 @@
 	EReference getXhtmlKbdType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getIns()
 	 * @see #getXhtmlKbdType()
@@ -23298,9 +23162,10 @@
 	EReference getXhtmlKbdType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getDel()
 	 * @see #getXhtmlKbdType()
@@ -23309,9 +23174,9 @@
 	EReference getXhtmlKbdType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getClass_()
 	 * @see #getXhtmlKbdType()
@@ -23321,8 +23186,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getId()
 	 * @see #getXhtmlKbdType()
@@ -23331,9 +23196,9 @@
 	EAttribute getXhtmlKbdType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getLang()
 	 * @see #getXhtmlKbdType()
@@ -23342,9 +23207,9 @@
 	EAttribute getXhtmlKbdType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getSpace()
 	 * @see #getXhtmlKbdType()
@@ -23353,9 +23218,9 @@
 	EAttribute getXhtmlKbdType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getStyle()
 	 * @see #getXhtmlKbdType()
@@ -23364,9 +23229,9 @@
 	EAttribute getXhtmlKbdType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType#getTitle()
 	 * @see #getXhtmlKbdType()
@@ -23375,9 +23240,9 @@
 	EAttribute getXhtmlKbdType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType <em>Li Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType <em>Li Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Li Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType
 	 * @generated
@@ -23385,9 +23250,9 @@
 	EClass getXhtmlLiType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getMixed()
 	 * @see #getXhtmlLiType()
@@ -23396,9 +23261,9 @@
 	EAttribute getXhtmlLiType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getXhtmlFlowMix
+	 * <em>Xhtml Flow Mix</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Flow Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getXhtmlFlowMix()
 	 * @see #getXhtmlLiType()
@@ -23407,9 +23272,10 @@
 	EAttribute getXhtmlLiType_XhtmlFlowMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH1 <em>H1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH1 <em>H1</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H1</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH1()
 	 * @see #getXhtmlLiType()
@@ -23418,9 +23284,10 @@
 	EReference getXhtmlLiType_H1();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH2 <em>H2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH2 <em>H2</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H2</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH2()
 	 * @see #getXhtmlLiType()
@@ -23429,9 +23296,10 @@
 	EReference getXhtmlLiType_H2();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH3 <em>H3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH3 <em>H3</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H3</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH3()
 	 * @see #getXhtmlLiType()
@@ -23440,9 +23308,10 @@
 	EReference getXhtmlLiType_H3();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH4 <em>H4</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH4 <em>H4</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H4</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH4()
 	 * @see #getXhtmlLiType()
@@ -23451,9 +23320,10 @@
 	EReference getXhtmlLiType_H4();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH5 <em>H5</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH5 <em>H5</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H5</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH5()
 	 * @see #getXhtmlLiType()
@@ -23462,9 +23332,10 @@
 	EReference getXhtmlLiType_H5();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH6 <em>H6</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH6 <em>H6</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H6</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getH6()
 	 * @see #getXhtmlLiType()
@@ -23473,9 +23344,10 @@
 	EReference getXhtmlLiType_H6();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getUl <em>Ul</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getUl <em>Ul</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ul</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getUl()
 	 * @see #getXhtmlLiType()
@@ -23484,9 +23356,10 @@
 	EReference getXhtmlLiType_Ul();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getOl <em>Ol</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getOl <em>Ol</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ol</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getOl()
 	 * @see #getXhtmlLiType()
@@ -23495,9 +23368,10 @@
 	EReference getXhtmlLiType_Ol();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDl <em>Dl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDl <em>Dl</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dl</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDl()
 	 * @see #getXhtmlLiType()
@@ -23506,9 +23380,9 @@
 	EReference getXhtmlLiType_Dl();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getP <em>P</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getP <em>P</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>P</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getP()
 	 * @see #getXhtmlLiType()
@@ -23517,9 +23391,10 @@
 	EReference getXhtmlLiType_P();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDiv <em>Div</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDiv <em>Div</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Div</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDiv()
 	 * @see #getXhtmlLiType()
@@ -23528,9 +23403,10 @@
 	EReference getXhtmlLiType_Div();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getPre <em>Pre</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getPre <em>Pre</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Pre</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getPre()
 	 * @see #getXhtmlLiType()
@@ -23539,9 +23415,10 @@
 	EReference getXhtmlLiType_Pre();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getBlockquote <em>Blockquote</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getBlockquote <em>Blockquote</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Blockquote</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getBlockquote()
 	 * @see #getXhtmlLiType()
@@ -23550,9 +23427,10 @@
 	EReference getXhtmlLiType_Blockquote();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getAddress <em>Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getAddress <em>Address</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Address</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getAddress()
 	 * @see #getXhtmlLiType()
@@ -23561,9 +23439,10 @@
 	EReference getXhtmlLiType_Address();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getHr <em>Hr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getHr <em>Hr</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Hr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getHr()
 	 * @see #getXhtmlLiType()
@@ -23572,9 +23451,10 @@
 	EReference getXhtmlLiType_Hr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTable <em>Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTable <em>Table</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Table</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTable()
 	 * @see #getXhtmlLiType()
@@ -23583,9 +23463,10 @@
 	EReference getXhtmlLiType_Table();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getBr()
 	 * @see #getXhtmlLiType()
@@ -23594,9 +23475,10 @@
 	EReference getXhtmlLiType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSpan()
 	 * @see #getXhtmlLiType()
@@ -23605,9 +23487,10 @@
 	EReference getXhtmlLiType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getEm()
 	 * @see #getXhtmlLiType()
@@ -23616,9 +23499,10 @@
 	EReference getXhtmlLiType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getStrong()
 	 * @see #getXhtmlLiType()
@@ -23627,9 +23511,10 @@
 	EReference getXhtmlLiType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDfn()
 	 * @see #getXhtmlLiType()
@@ -23638,9 +23523,10 @@
 	EReference getXhtmlLiType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getCode()
 	 * @see #getXhtmlLiType()
@@ -23649,9 +23535,10 @@
 	EReference getXhtmlLiType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSamp()
 	 * @see #getXhtmlLiType()
@@ -23660,9 +23547,10 @@
 	EReference getXhtmlLiType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getKbd()
 	 * @see #getXhtmlLiType()
@@ -23671,9 +23559,10 @@
 	EReference getXhtmlLiType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getVar()
 	 * @see #getXhtmlLiType()
@@ -23682,9 +23571,10 @@
 	EReference getXhtmlLiType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getCite()
 	 * @see #getXhtmlLiType()
@@ -23693,9 +23583,10 @@
 	EReference getXhtmlLiType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getAbbr()
 	 * @see #getXhtmlLiType()
@@ -23704,9 +23595,10 @@
 	EReference getXhtmlLiType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getAcronym()
 	 * @see #getXhtmlLiType()
@@ -23715,9 +23607,9 @@
 	EReference getXhtmlLiType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getQ()
 	 * @see #getXhtmlLiType()
@@ -23726,9 +23618,10 @@
 	EReference getXhtmlLiType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTt()
 	 * @see #getXhtmlLiType()
@@ -23737,9 +23630,9 @@
 	EReference getXhtmlLiType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getI()
 	 * @see #getXhtmlLiType()
@@ -23748,9 +23641,9 @@
 	EReference getXhtmlLiType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getB()
 	 * @see #getXhtmlLiType()
@@ -23759,9 +23652,10 @@
 	EReference getXhtmlLiType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getBig()
 	 * @see #getXhtmlLiType()
@@ -23770,9 +23664,10 @@
 	EReference getXhtmlLiType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSmall()
 	 * @see #getXhtmlLiType()
@@ -23781,9 +23676,10 @@
 	EReference getXhtmlLiType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSub()
 	 * @see #getXhtmlLiType()
@@ -23792,9 +23688,10 @@
 	EReference getXhtmlLiType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSup()
 	 * @see #getXhtmlLiType()
@@ -23803,9 +23700,9 @@
 	EReference getXhtmlLiType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getA()
 	 * @see #getXhtmlLiType()
@@ -23814,9 +23711,10 @@
 	EReference getXhtmlLiType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getObject()
 	 * @see #getXhtmlLiType()
@@ -23825,9 +23723,10 @@
 	EReference getXhtmlLiType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getIns()
 	 * @see #getXhtmlLiType()
@@ -23836,9 +23735,10 @@
 	EReference getXhtmlLiType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getDel()
 	 * @see #getXhtmlLiType()
@@ -23847,9 +23747,9 @@
 	EReference getXhtmlLiType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getClass_()
 	 * @see #getXhtmlLiType()
@@ -23859,8 +23759,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getId()
 	 * @see #getXhtmlLiType()
@@ -23869,9 +23769,9 @@
 	EAttribute getXhtmlLiType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getLang()
 	 * @see #getXhtmlLiType()
@@ -23880,9 +23780,9 @@
 	EAttribute getXhtmlLiType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getSpace()
 	 * @see #getXhtmlLiType()
@@ -23891,9 +23791,9 @@
 	EAttribute getXhtmlLiType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getStyle()
 	 * @see #getXhtmlLiType()
@@ -23902,9 +23802,9 @@
 	EAttribute getXhtmlLiType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType#getTitle()
 	 * @see #getXhtmlLiType()
@@ -23914,8 +23814,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType <em>Object Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Object Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType
 	 * @generated
@@ -23923,9 +23823,9 @@
 	EClass getXhtmlObjectType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getMixed()
 	 * @see #getXhtmlObjectType()
@@ -23934,9 +23834,9 @@
 	EAttribute getXhtmlObjectType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getGroup <em>Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getGroup
+	 * <em>Group</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Group</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getGroup()
 	 * @see #getXhtmlObjectType()
@@ -23945,9 +23845,10 @@
 	EAttribute getXhtmlObjectType_Group();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getParam <em>Param</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getParam <em>Param</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Param</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getParam()
 	 * @see #getXhtmlObjectType()
@@ -23956,9 +23857,10 @@
 	EReference getXhtmlObjectType_Param();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH1 <em>H1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH1 <em>H1</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H1</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH1()
 	 * @see #getXhtmlObjectType()
@@ -23967,9 +23869,10 @@
 	EReference getXhtmlObjectType_H1();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH2 <em>H2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH2 <em>H2</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H2</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH2()
 	 * @see #getXhtmlObjectType()
@@ -23978,9 +23881,10 @@
 	EReference getXhtmlObjectType_H2();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH3 <em>H3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH3 <em>H3</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H3</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH3()
 	 * @see #getXhtmlObjectType()
@@ -23989,9 +23893,10 @@
 	EReference getXhtmlObjectType_H3();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH4 <em>H4</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH4 <em>H4</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H4</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH4()
 	 * @see #getXhtmlObjectType()
@@ -24000,9 +23905,10 @@
 	EReference getXhtmlObjectType_H4();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH5 <em>H5</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH5 <em>H5</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H5</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH5()
 	 * @see #getXhtmlObjectType()
@@ -24011,9 +23917,10 @@
 	EReference getXhtmlObjectType_H5();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH6 <em>H6</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH6 <em>H6</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H6</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getH6()
 	 * @see #getXhtmlObjectType()
@@ -24022,9 +23929,10 @@
 	EReference getXhtmlObjectType_H6();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getUl <em>Ul</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getUl <em>Ul</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ul</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getUl()
 	 * @see #getXhtmlObjectType()
@@ -24033,9 +23941,10 @@
 	EReference getXhtmlObjectType_Ul();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getOl <em>Ol</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getOl <em>Ol</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ol</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getOl()
 	 * @see #getXhtmlObjectType()
@@ -24044,9 +23953,10 @@
 	EReference getXhtmlObjectType_Ol();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDl <em>Dl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDl <em>Dl</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dl</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDl()
 	 * @see #getXhtmlObjectType()
@@ -24055,9 +23965,10 @@
 	EReference getXhtmlObjectType_Dl();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getP <em>P</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getP <em>P</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>P</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getP()
 	 * @see #getXhtmlObjectType()
@@ -24066,9 +23977,10 @@
 	EReference getXhtmlObjectType_P();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDiv <em>Div</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDiv <em>Div</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Div</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDiv()
 	 * @see #getXhtmlObjectType()
@@ -24077,9 +23989,10 @@
 	EReference getXhtmlObjectType_Div();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getPre <em>Pre</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getPre <em>Pre</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Pre</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getPre()
 	 * @see #getXhtmlObjectType()
@@ -24088,9 +24001,10 @@
 	EReference getXhtmlObjectType_Pre();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getBlockquote <em>Blockquote</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getBlockquote <em>Blockquote</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Blockquote</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getBlockquote()
 	 * @see #getXhtmlObjectType()
@@ -24099,9 +24013,10 @@
 	EReference getXhtmlObjectType_Blockquote();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getAddress <em>Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getAddress <em>Address</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Address</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getAddress()
 	 * @see #getXhtmlObjectType()
@@ -24110,9 +24025,10 @@
 	EReference getXhtmlObjectType_Address();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getHr <em>Hr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getHr <em>Hr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Hr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getHr()
 	 * @see #getXhtmlObjectType()
@@ -24121,9 +24037,10 @@
 	EReference getXhtmlObjectType_Hr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTable <em>Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTable <em>Table</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Table</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTable()
 	 * @see #getXhtmlObjectType()
@@ -24132,9 +24049,10 @@
 	EReference getXhtmlObjectType_Table();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getBr()
 	 * @see #getXhtmlObjectType()
@@ -24143,9 +24061,10 @@
 	EReference getXhtmlObjectType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSpan()
 	 * @see #getXhtmlObjectType()
@@ -24154,9 +24073,10 @@
 	EReference getXhtmlObjectType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getEm()
 	 * @see #getXhtmlObjectType()
@@ -24165,9 +24085,10 @@
 	EReference getXhtmlObjectType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStrong()
 	 * @see #getXhtmlObjectType()
@@ -24176,9 +24097,10 @@
 	EReference getXhtmlObjectType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDfn()
 	 * @see #getXhtmlObjectType()
@@ -24187,9 +24109,10 @@
 	EReference getXhtmlObjectType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCode()
 	 * @see #getXhtmlObjectType()
@@ -24198,9 +24121,10 @@
 	EReference getXhtmlObjectType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSamp()
 	 * @see #getXhtmlObjectType()
@@ -24209,9 +24133,10 @@
 	EReference getXhtmlObjectType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getKbd()
 	 * @see #getXhtmlObjectType()
@@ -24220,9 +24145,10 @@
 	EReference getXhtmlObjectType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getVar()
 	 * @see #getXhtmlObjectType()
@@ -24231,9 +24157,10 @@
 	EReference getXhtmlObjectType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCite()
 	 * @see #getXhtmlObjectType()
@@ -24242,9 +24169,10 @@
 	EReference getXhtmlObjectType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getAbbr()
 	 * @see #getXhtmlObjectType()
@@ -24253,9 +24181,10 @@
 	EReference getXhtmlObjectType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getAcronym()
 	 * @see #getXhtmlObjectType()
@@ -24264,9 +24193,10 @@
 	EReference getXhtmlObjectType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getQ()
 	 * @see #getXhtmlObjectType()
@@ -24275,9 +24205,10 @@
 	EReference getXhtmlObjectType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTt()
 	 * @see #getXhtmlObjectType()
@@ -24286,9 +24217,10 @@
 	EReference getXhtmlObjectType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getI()
 	 * @see #getXhtmlObjectType()
@@ -24297,9 +24229,10 @@
 	EReference getXhtmlObjectType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getB()
 	 * @see #getXhtmlObjectType()
@@ -24308,9 +24241,10 @@
 	EReference getXhtmlObjectType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getBig()
 	 * @see #getXhtmlObjectType()
@@ -24319,9 +24253,10 @@
 	EReference getXhtmlObjectType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSmall()
 	 * @see #getXhtmlObjectType()
@@ -24330,9 +24265,10 @@
 	EReference getXhtmlObjectType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSub()
 	 * @see #getXhtmlObjectType()
@@ -24341,9 +24277,10 @@
 	EReference getXhtmlObjectType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSup()
 	 * @see #getXhtmlObjectType()
@@ -24352,9 +24289,10 @@
 	EReference getXhtmlObjectType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getA()
 	 * @see #getXhtmlObjectType()
@@ -24363,9 +24301,10 @@
 	EReference getXhtmlObjectType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getObject()
 	 * @see #getXhtmlObjectType()
@@ -24374,9 +24313,10 @@
 	EReference getXhtmlObjectType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getIns()
 	 * @see #getXhtmlObjectType()
@@ -24385,9 +24325,10 @@
 	EReference getXhtmlObjectType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDel()
 	 * @see #getXhtmlObjectType()
@@ -24396,9 +24337,9 @@
 	EReference getXhtmlObjectType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getArchive <em>Archive</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getArchive
+	 * <em>Archive</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Archive</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getArchive()
 	 * @see #getXhtmlObjectType()
@@ -24407,9 +24348,9 @@
 	EAttribute getXhtmlObjectType_Archive();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getClass_()
 	 * @see #getXhtmlObjectType()
@@ -24418,9 +24359,9 @@
 	EAttribute getXhtmlObjectType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getClassid <em>Classid</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getClassid
+	 * <em>Classid</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Classid</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getClassid()
 	 * @see #getXhtmlObjectType()
@@ -24429,9 +24370,9 @@
 	EAttribute getXhtmlObjectType_Classid();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCodebase <em>Codebase</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCodebase
+	 * <em>Codebase</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Codebase</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCodebase()
 	 * @see #getXhtmlObjectType()
@@ -24440,9 +24381,9 @@
 	EAttribute getXhtmlObjectType_Codebase();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCodetype <em>Codetype</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCodetype
+	 * <em>Codetype</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Codetype</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getCodetype()
 	 * @see #getXhtmlObjectType()
@@ -24451,9 +24392,9 @@
 	EAttribute getXhtmlObjectType_Codetype();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getData <em>Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getData
+	 * <em>Data</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Data</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getData()
 	 * @see #getXhtmlObjectType()
@@ -24462,9 +24403,9 @@
 	EAttribute getXhtmlObjectType_Data();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDeclare <em>Declare</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDeclare
+	 * <em>Declare</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Declare</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getDeclare()
 	 * @see #getXhtmlObjectType()
@@ -24473,9 +24414,9 @@
 	EAttribute getXhtmlObjectType_Declare();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getHeight <em>Height</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getHeight
+	 * <em>Height</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Height</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getHeight()
 	 * @see #getXhtmlObjectType()
@@ -24484,9 +24425,9 @@
 	EAttribute getXhtmlObjectType_Height();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getId
+	 * <em>Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getId()
 	 * @see #getXhtmlObjectType()
@@ -24495,9 +24436,9 @@
 	EAttribute getXhtmlObjectType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getLang()
 	 * @see #getXhtmlObjectType()
@@ -24506,9 +24447,9 @@
 	EAttribute getXhtmlObjectType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getName
+	 * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getName()
 	 * @see #getXhtmlObjectType()
@@ -24517,9 +24458,9 @@
 	EAttribute getXhtmlObjectType_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getSpace()
 	 * @see #getXhtmlObjectType()
@@ -24528,9 +24469,9 @@
 	EAttribute getXhtmlObjectType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStandby <em>Standby</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStandby
+	 * <em>Standby</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Standby</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStandby()
 	 * @see #getXhtmlObjectType()
@@ -24539,9 +24480,9 @@
 	EAttribute getXhtmlObjectType_Standby();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getStyle()
 	 * @see #getXhtmlObjectType()
@@ -24550,9 +24491,9 @@
 	EAttribute getXhtmlObjectType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTabindex <em>Tabindex</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTabindex
+	 * <em>Tabindex</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Tabindex</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTabindex()
 	 * @see #getXhtmlObjectType()
@@ -24561,9 +24502,9 @@
 	EAttribute getXhtmlObjectType_Tabindex();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getTitle()
 	 * @see #getXhtmlObjectType()
@@ -24572,9 +24513,9 @@
 	EAttribute getXhtmlObjectType_Title();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getType
+	 * <em>Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getType()
 	 * @see #getXhtmlObjectType()
@@ -24583,9 +24524,9 @@
 	EAttribute getXhtmlObjectType_Type();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getWidth <em>Width</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getWidth
+	 * <em>Width</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Width</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType#getWidth()
 	 * @see #getXhtmlObjectType()
@@ -24594,9 +24535,9 @@
 	EAttribute getXhtmlObjectType_Width();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType <em>Ol Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType <em>Ol Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Ol Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlOlType
 	 * @generated
@@ -24604,9 +24545,10 @@
 	EClass getXhtmlOlType();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getLi <em>Li</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getLi <em>Li</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Li</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getLi()
 	 * @see #getXhtmlOlType()
@@ -24615,9 +24557,9 @@
 	EReference getXhtmlOlType_Li();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getClass_()
 	 * @see #getXhtmlOlType()
@@ -24627,8 +24569,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getId()
 	 * @see #getXhtmlOlType()
@@ -24637,9 +24579,9 @@
 	EAttribute getXhtmlOlType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getLang()
 	 * @see #getXhtmlOlType()
@@ -24648,9 +24590,9 @@
 	EAttribute getXhtmlOlType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getSpace()
 	 * @see #getXhtmlOlType()
@@ -24659,9 +24601,9 @@
 	EAttribute getXhtmlOlType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getStyle()
 	 * @see #getXhtmlOlType()
@@ -24670,9 +24612,9 @@
 	EAttribute getXhtmlOlType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlOlType#getTitle()
 	 * @see #getXhtmlOlType()
@@ -24682,8 +24624,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType <em>Param Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Param Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlParamType
 	 * @generated
@@ -24691,9 +24633,9 @@
 	EClass getXhtmlParamType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getId <em>Id</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getId()
 	 * @see #getXhtmlParamType()
@@ -24702,9 +24644,9 @@
 	EAttribute getXhtmlParamType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getName
+	 * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getName()
 	 * @see #getXhtmlParamType()
@@ -24713,9 +24655,9 @@
 	EAttribute getXhtmlParamType_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getType
+	 * <em>Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getType()
 	 * @see #getXhtmlParamType()
@@ -24724,9 +24666,9 @@
 	EAttribute getXhtmlParamType_Type();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValue
+	 * <em>Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValue()
 	 * @see #getXhtmlParamType()
@@ -24735,9 +24677,9 @@
 	EAttribute getXhtmlParamType_Value();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValuetype <em>Valuetype</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValuetype
+	 * <em>Valuetype</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Valuetype</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValuetype()
 	 * @see #getXhtmlParamType()
@@ -24746,9 +24688,9 @@
 	EAttribute getXhtmlParamType_Valuetype();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType <em>Pre Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType <em>Pre Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Pre Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType
 	 * @generated
@@ -24756,9 +24698,9 @@
 	EClass getXhtmlPreType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getMixed()
 	 * @see #getXhtmlPreType()
@@ -24767,9 +24709,10 @@
 	EAttribute getXhtmlPreType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getXhtmlInlinePreMix <em>Xhtml Inline Pre Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getXhtmlInlinePreMix <em>Xhtml Inline Pre Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Pre Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getXhtmlInlinePreMix()
 	 * @see #getXhtmlPreType()
@@ -24778,9 +24721,10 @@
 	EAttribute getXhtmlPreType_XhtmlInlinePreMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getBr()
 	 * @see #getXhtmlPreType()
@@ -24789,9 +24733,10 @@
 	EReference getXhtmlPreType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSpan()
 	 * @see #getXhtmlPreType()
@@ -24800,9 +24745,10 @@
 	EReference getXhtmlPreType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getEm()
 	 * @see #getXhtmlPreType()
@@ -24811,9 +24757,10 @@
 	EReference getXhtmlPreType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getStrong()
 	 * @see #getXhtmlPreType()
@@ -24822,9 +24769,10 @@
 	EReference getXhtmlPreType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getDfn()
 	 * @see #getXhtmlPreType()
@@ -24833,9 +24781,10 @@
 	EReference getXhtmlPreType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getCode()
 	 * @see #getXhtmlPreType()
@@ -24844,9 +24793,10 @@
 	EReference getXhtmlPreType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSamp()
 	 * @see #getXhtmlPreType()
@@ -24855,9 +24805,10 @@
 	EReference getXhtmlPreType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getKbd()
 	 * @see #getXhtmlPreType()
@@ -24866,9 +24817,10 @@
 	EReference getXhtmlPreType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getVar()
 	 * @see #getXhtmlPreType()
@@ -24877,9 +24829,10 @@
 	EReference getXhtmlPreType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getCite()
 	 * @see #getXhtmlPreType()
@@ -24888,9 +24841,10 @@
 	EReference getXhtmlPreType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getAbbr()
 	 * @see #getXhtmlPreType()
@@ -24899,9 +24853,10 @@
 	EReference getXhtmlPreType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getAcronym()
 	 * @see #getXhtmlPreType()
@@ -24910,9 +24865,10 @@
 	EReference getXhtmlPreType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getQ()
 	 * @see #getXhtmlPreType()
@@ -24921,9 +24877,10 @@
 	EReference getXhtmlPreType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getTt()
 	 * @see #getXhtmlPreType()
@@ -24932,9 +24889,10 @@
 	EReference getXhtmlPreType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getI()
 	 * @see #getXhtmlPreType()
@@ -24943,9 +24901,10 @@
 	EReference getXhtmlPreType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getB()
 	 * @see #getXhtmlPreType()
@@ -24954,9 +24913,10 @@
 	EReference getXhtmlPreType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getA()
 	 * @see #getXhtmlPreType()
@@ -24965,9 +24925,10 @@
 	EReference getXhtmlPreType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getIns()
 	 * @see #getXhtmlPreType()
@@ -24976,9 +24937,10 @@
 	EReference getXhtmlPreType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getDel()
 	 * @see #getXhtmlPreType()
@@ -24987,9 +24949,9 @@
 	EReference getXhtmlPreType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getClass_()
 	 * @see #getXhtmlPreType()
@@ -24999,8 +24961,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getId()
 	 * @see #getXhtmlPreType()
@@ -25009,9 +24971,9 @@
 	EAttribute getXhtmlPreType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getLang()
 	 * @see #getXhtmlPreType()
@@ -25020,9 +24982,9 @@
 	EAttribute getXhtmlPreType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSpace()
 	 * @see #getXhtmlPreType()
@@ -25031,9 +24993,9 @@
 	EAttribute getXhtmlPreType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getStyle()
 	 * @see #getXhtmlPreType()
@@ -25042,9 +25004,9 @@
 	EAttribute getXhtmlPreType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getTitle()
 	 * @see #getXhtmlPreType()
@@ -25053,9 +25015,9 @@
 	EAttribute getXhtmlPreType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType <em>PType</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType <em>PType</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>PType</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType
 	 * @generated
@@ -25063,9 +25025,9 @@
 	EClass getXhtmlPType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getMixed()
 	 * @see #getXhtmlPType()
@@ -25074,9 +25036,10 @@
 	EAttribute getXhtmlPType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getXhtmlInlineMix()
 	 * @see #getXhtmlPType()
@@ -25085,9 +25048,10 @@
 	EAttribute getXhtmlPType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getBr()
 	 * @see #getXhtmlPType()
@@ -25096,9 +25060,10 @@
 	EReference getXhtmlPType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSpan()
 	 * @see #getXhtmlPType()
@@ -25107,9 +25072,10 @@
 	EReference getXhtmlPType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getEm()
 	 * @see #getXhtmlPType()
@@ -25118,9 +25084,10 @@
 	EReference getXhtmlPType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getStrong()
 	 * @see #getXhtmlPType()
@@ -25129,9 +25096,10 @@
 	EReference getXhtmlPType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getDfn()
 	 * @see #getXhtmlPType()
@@ -25140,9 +25108,10 @@
 	EReference getXhtmlPType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getCode()
 	 * @see #getXhtmlPType()
@@ -25151,9 +25120,10 @@
 	EReference getXhtmlPType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSamp()
 	 * @see #getXhtmlPType()
@@ -25162,9 +25132,10 @@
 	EReference getXhtmlPType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getKbd()
 	 * @see #getXhtmlPType()
@@ -25173,9 +25144,10 @@
 	EReference getXhtmlPType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getVar()
 	 * @see #getXhtmlPType()
@@ -25184,9 +25156,10 @@
 	EReference getXhtmlPType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getCite()
 	 * @see #getXhtmlPType()
@@ -25195,9 +25168,10 @@
 	EReference getXhtmlPType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getAbbr()
 	 * @see #getXhtmlPType()
@@ -25206,9 +25180,10 @@
 	EReference getXhtmlPType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getAcronym()
 	 * @see #getXhtmlPType()
@@ -25217,9 +25192,9 @@
 	EReference getXhtmlPType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getQ
+	 * <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getQ()
 	 * @see #getXhtmlPType()
@@ -25228,9 +25203,10 @@
 	EReference getXhtmlPType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getTt()
 	 * @see #getXhtmlPType()
@@ -25239,9 +25215,9 @@
 	EReference getXhtmlPType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getI
+	 * <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getI()
 	 * @see #getXhtmlPType()
@@ -25250,9 +25226,9 @@
 	EReference getXhtmlPType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getB
+	 * <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getB()
 	 * @see #getXhtmlPType()
@@ -25261,9 +25237,10 @@
 	EReference getXhtmlPType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getBig()
 	 * @see #getXhtmlPType()
@@ -25272,9 +25249,10 @@
 	EReference getXhtmlPType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSmall()
 	 * @see #getXhtmlPType()
@@ -25283,9 +25261,10 @@
 	EReference getXhtmlPType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSub()
 	 * @see #getXhtmlPType()
@@ -25294,9 +25273,10 @@
 	EReference getXhtmlPType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSup()
 	 * @see #getXhtmlPType()
@@ -25305,9 +25285,9 @@
 	EReference getXhtmlPType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getA
+	 * <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getA()
 	 * @see #getXhtmlPType()
@@ -25316,9 +25296,10 @@
 	EReference getXhtmlPType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getObject()
 	 * @see #getXhtmlPType()
@@ -25327,9 +25308,10 @@
 	EReference getXhtmlPType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getIns()
 	 * @see #getXhtmlPType()
@@ -25338,9 +25320,10 @@
 	EReference getXhtmlPType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getDel()
 	 * @see #getXhtmlPType()
@@ -25349,9 +25332,9 @@
 	EReference getXhtmlPType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getClass_()
 	 * @see #getXhtmlPType()
@@ -25361,8 +25344,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getId()
 	 * @see #getXhtmlPType()
@@ -25371,9 +25354,9 @@
 	EAttribute getXhtmlPType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getLang <em>Lang</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getLang()
 	 * @see #getXhtmlPType()
@@ -25382,9 +25365,9 @@
 	EAttribute getXhtmlPType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getSpace()
 	 * @see #getXhtmlPType()
@@ -25393,9 +25376,9 @@
 	EAttribute getXhtmlPType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getStyle()
 	 * @see #getXhtmlPType()
@@ -25404,9 +25387,9 @@
 	EAttribute getXhtmlPType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType#getTitle()
 	 * @see #getXhtmlPType()
@@ -25415,9 +25398,9 @@
 	EAttribute getXhtmlPType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType <em>QType</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType <em>QType</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>QType</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType
 	 * @generated
@@ -25425,9 +25408,9 @@
 	EClass getXhtmlQType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getMixed()
 	 * @see #getXhtmlQType()
@@ -25436,9 +25419,10 @@
 	EAttribute getXhtmlQType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getXhtmlInlineMix()
 	 * @see #getXhtmlQType()
@@ -25447,9 +25431,10 @@
 	EAttribute getXhtmlQType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getBr()
 	 * @see #getXhtmlQType()
@@ -25458,9 +25443,10 @@
 	EReference getXhtmlQType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSpan()
 	 * @see #getXhtmlQType()
@@ -25469,9 +25455,10 @@
 	EReference getXhtmlQType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getEm()
 	 * @see #getXhtmlQType()
@@ -25480,9 +25467,10 @@
 	EReference getXhtmlQType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getStrong()
 	 * @see #getXhtmlQType()
@@ -25491,9 +25479,10 @@
 	EReference getXhtmlQType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getDfn()
 	 * @see #getXhtmlQType()
@@ -25502,9 +25491,10 @@
 	EReference getXhtmlQType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCode()
 	 * @see #getXhtmlQType()
@@ -25513,9 +25503,10 @@
 	EReference getXhtmlQType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSamp()
 	 * @see #getXhtmlQType()
@@ -25524,9 +25515,10 @@
 	EReference getXhtmlQType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getKbd()
 	 * @see #getXhtmlQType()
@@ -25535,9 +25527,10 @@
 	EReference getXhtmlQType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getVar()
 	 * @see #getXhtmlQType()
@@ -25546,9 +25539,10 @@
 	EReference getXhtmlQType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCite()
 	 * @see #getXhtmlQType()
@@ -25557,9 +25551,10 @@
 	EReference getXhtmlQType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getAbbr()
 	 * @see #getXhtmlQType()
@@ -25568,9 +25563,10 @@
 	EReference getXhtmlQType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getAcronym()
 	 * @see #getXhtmlQType()
@@ -25579,9 +25575,9 @@
 	EReference getXhtmlQType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getQ
+	 * <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getQ()
 	 * @see #getXhtmlQType()
@@ -25590,9 +25586,10 @@
 	EReference getXhtmlQType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getTt()
 	 * @see #getXhtmlQType()
@@ -25601,9 +25598,9 @@
 	EReference getXhtmlQType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getI
+	 * <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getI()
 	 * @see #getXhtmlQType()
@@ -25612,9 +25609,9 @@
 	EReference getXhtmlQType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getB
+	 * <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getB()
 	 * @see #getXhtmlQType()
@@ -25623,9 +25620,10 @@
 	EReference getXhtmlQType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getBig()
 	 * @see #getXhtmlQType()
@@ -25634,9 +25632,10 @@
 	EReference getXhtmlQType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSmall()
 	 * @see #getXhtmlQType()
@@ -25645,9 +25644,10 @@
 	EReference getXhtmlQType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSub()
 	 * @see #getXhtmlQType()
@@ -25656,9 +25656,10 @@
 	EReference getXhtmlQType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSup()
 	 * @see #getXhtmlQType()
@@ -25667,9 +25668,9 @@
 	EReference getXhtmlQType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getA
+	 * <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getA()
 	 * @see #getXhtmlQType()
@@ -25678,9 +25679,10 @@
 	EReference getXhtmlQType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getObject()
 	 * @see #getXhtmlQType()
@@ -25689,9 +25691,10 @@
 	EReference getXhtmlQType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getIns()
 	 * @see #getXhtmlQType()
@@ -25700,9 +25703,10 @@
 	EReference getXhtmlQType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getDel()
 	 * @see #getXhtmlQType()
@@ -25711,9 +25715,9 @@
 	EReference getXhtmlQType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCite1 <em>Cite1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCite1
+	 * <em>Cite1</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Cite1</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCite1()
 	 * @see #getXhtmlQType()
@@ -25722,9 +25726,9 @@
 	EAttribute getXhtmlQType_Cite1();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getClass_()
 	 * @see #getXhtmlQType()
@@ -25734,8 +25738,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getId()
 	 * @see #getXhtmlQType()
@@ -25744,9 +25748,9 @@
 	EAttribute getXhtmlQType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getLang <em>Lang</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getLang()
 	 * @see #getXhtmlQType()
@@ -25755,9 +25759,9 @@
 	EAttribute getXhtmlQType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSpace()
 	 * @see #getXhtmlQType()
@@ -25766,9 +25770,9 @@
 	EAttribute getXhtmlQType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getStyle()
 	 * @see #getXhtmlQType()
@@ -25777,9 +25781,9 @@
 	EAttribute getXhtmlQType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getTitle()
 	 * @see #getXhtmlQType()
@@ -25788,9 +25792,9 @@
 	EAttribute getXhtmlQType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType <em>Samp Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType <em>Samp Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Samp Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType
 	 * @generated
@@ -25798,9 +25802,9 @@
 	EClass getXhtmlSampType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getMixed()
 	 * @see #getXhtmlSampType()
@@ -25809,9 +25813,10 @@
 	EAttribute getXhtmlSampType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getXhtmlInlineMix()
 	 * @see #getXhtmlSampType()
@@ -25820,9 +25825,10 @@
 	EAttribute getXhtmlSampType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getBr()
 	 * @see #getXhtmlSampType()
@@ -25831,9 +25837,10 @@
 	EReference getXhtmlSampType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSpan()
 	 * @see #getXhtmlSampType()
@@ -25842,9 +25849,10 @@
 	EReference getXhtmlSampType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getEm()
 	 * @see #getXhtmlSampType()
@@ -25853,9 +25861,10 @@
 	EReference getXhtmlSampType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getStrong()
 	 * @see #getXhtmlSampType()
@@ -25864,9 +25873,10 @@
 	EReference getXhtmlSampType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getDfn()
 	 * @see #getXhtmlSampType()
@@ -25875,9 +25885,10 @@
 	EReference getXhtmlSampType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getCode()
 	 * @see #getXhtmlSampType()
@@ -25886,9 +25897,10 @@
 	EReference getXhtmlSampType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSamp()
 	 * @see #getXhtmlSampType()
@@ -25897,9 +25909,10 @@
 	EReference getXhtmlSampType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getKbd()
 	 * @see #getXhtmlSampType()
@@ -25908,9 +25921,10 @@
 	EReference getXhtmlSampType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getVar()
 	 * @see #getXhtmlSampType()
@@ -25919,9 +25933,10 @@
 	EReference getXhtmlSampType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getCite()
 	 * @see #getXhtmlSampType()
@@ -25930,9 +25945,10 @@
 	EReference getXhtmlSampType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getAbbr()
 	 * @see #getXhtmlSampType()
@@ -25941,9 +25957,10 @@
 	EReference getXhtmlSampType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getAcronym()
 	 * @see #getXhtmlSampType()
@@ -25952,9 +25969,10 @@
 	EReference getXhtmlSampType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getQ()
 	 * @see #getXhtmlSampType()
@@ -25963,9 +25981,10 @@
 	EReference getXhtmlSampType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getTt()
 	 * @see #getXhtmlSampType()
@@ -25974,9 +25993,10 @@
 	EReference getXhtmlSampType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getI()
 	 * @see #getXhtmlSampType()
@@ -25985,9 +26005,10 @@
 	EReference getXhtmlSampType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getB()
 	 * @see #getXhtmlSampType()
@@ -25996,9 +26017,10 @@
 	EReference getXhtmlSampType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getBig()
 	 * @see #getXhtmlSampType()
@@ -26007,9 +26029,10 @@
 	EReference getXhtmlSampType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSmall()
 	 * @see #getXhtmlSampType()
@@ -26018,9 +26041,10 @@
 	EReference getXhtmlSampType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSub()
 	 * @see #getXhtmlSampType()
@@ -26029,9 +26053,10 @@
 	EReference getXhtmlSampType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSup()
 	 * @see #getXhtmlSampType()
@@ -26040,9 +26065,10 @@
 	EReference getXhtmlSampType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getA()
 	 * @see #getXhtmlSampType()
@@ -26051,9 +26077,10 @@
 	EReference getXhtmlSampType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getObject()
 	 * @see #getXhtmlSampType()
@@ -26062,9 +26089,10 @@
 	EReference getXhtmlSampType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getIns()
 	 * @see #getXhtmlSampType()
@@ -26073,9 +26101,10 @@
 	EReference getXhtmlSampType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getDel()
 	 * @see #getXhtmlSampType()
@@ -26084,9 +26113,9 @@
 	EReference getXhtmlSampType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getClass_()
 	 * @see #getXhtmlSampType()
@@ -26095,9 +26124,9 @@
 	EAttribute getXhtmlSampType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getId <em>Id</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getId()
 	 * @see #getXhtmlSampType()
@@ -26106,9 +26135,9 @@
 	EAttribute getXhtmlSampType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getLang()
 	 * @see #getXhtmlSampType()
@@ -26117,9 +26146,9 @@
 	EAttribute getXhtmlSampType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSpace()
 	 * @see #getXhtmlSampType()
@@ -26128,9 +26157,9 @@
 	EAttribute getXhtmlSampType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getStyle()
 	 * @see #getXhtmlSampType()
@@ -26139,9 +26168,9 @@
 	EAttribute getXhtmlSampType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getTitle()
 	 * @see #getXhtmlSampType()
@@ -26150,9 +26179,9 @@
 	EAttribute getXhtmlSampType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType <em>Span Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType <em>Span Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Span Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType
 	 * @generated
@@ -26160,9 +26189,9 @@
 	EClass getXhtmlSpanType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getMixed()
 	 * @see #getXhtmlSpanType()
@@ -26171,9 +26200,10 @@
 	EAttribute getXhtmlSpanType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getXhtmlInlineMix()
 	 * @see #getXhtmlSpanType()
@@ -26182,9 +26212,10 @@
 	EAttribute getXhtmlSpanType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getBr()
 	 * @see #getXhtmlSpanType()
@@ -26193,9 +26224,10 @@
 	EReference getXhtmlSpanType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSpan()
 	 * @see #getXhtmlSpanType()
@@ -26204,9 +26236,10 @@
 	EReference getXhtmlSpanType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getEm()
 	 * @see #getXhtmlSpanType()
@@ -26215,9 +26248,10 @@
 	EReference getXhtmlSpanType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getStrong()
 	 * @see #getXhtmlSpanType()
@@ -26226,9 +26260,10 @@
 	EReference getXhtmlSpanType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getDfn()
 	 * @see #getXhtmlSpanType()
@@ -26237,9 +26272,10 @@
 	EReference getXhtmlSpanType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getCode()
 	 * @see #getXhtmlSpanType()
@@ -26248,9 +26284,10 @@
 	EReference getXhtmlSpanType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSamp()
 	 * @see #getXhtmlSpanType()
@@ -26259,9 +26296,10 @@
 	EReference getXhtmlSpanType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getKbd()
 	 * @see #getXhtmlSpanType()
@@ -26270,9 +26308,10 @@
 	EReference getXhtmlSpanType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getVar()
 	 * @see #getXhtmlSpanType()
@@ -26281,9 +26320,10 @@
 	EReference getXhtmlSpanType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getCite()
 	 * @see #getXhtmlSpanType()
@@ -26292,9 +26332,10 @@
 	EReference getXhtmlSpanType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getAbbr()
 	 * @see #getXhtmlSpanType()
@@ -26303,9 +26344,10 @@
 	EReference getXhtmlSpanType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getAcronym()
 	 * @see #getXhtmlSpanType()
@@ -26314,9 +26356,10 @@
 	EReference getXhtmlSpanType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getQ()
 	 * @see #getXhtmlSpanType()
@@ -26325,9 +26368,10 @@
 	EReference getXhtmlSpanType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getTt()
 	 * @see #getXhtmlSpanType()
@@ -26336,9 +26380,10 @@
 	EReference getXhtmlSpanType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getI()
 	 * @see #getXhtmlSpanType()
@@ -26347,9 +26392,10 @@
 	EReference getXhtmlSpanType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getB()
 	 * @see #getXhtmlSpanType()
@@ -26358,9 +26404,10 @@
 	EReference getXhtmlSpanType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getBig()
 	 * @see #getXhtmlSpanType()
@@ -26369,9 +26416,10 @@
 	EReference getXhtmlSpanType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSmall()
 	 * @see #getXhtmlSpanType()
@@ -26380,9 +26428,10 @@
 	EReference getXhtmlSpanType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSub()
 	 * @see #getXhtmlSpanType()
@@ -26391,9 +26440,10 @@
 	EReference getXhtmlSpanType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSup()
 	 * @see #getXhtmlSpanType()
@@ -26402,9 +26452,10 @@
 	EReference getXhtmlSpanType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getA()
 	 * @see #getXhtmlSpanType()
@@ -26413,9 +26464,10 @@
 	EReference getXhtmlSpanType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getObject()
 	 * @see #getXhtmlSpanType()
@@ -26424,9 +26476,10 @@
 	EReference getXhtmlSpanType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getIns()
 	 * @see #getXhtmlSpanType()
@@ -26435,9 +26488,10 @@
 	EReference getXhtmlSpanType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getDel()
 	 * @see #getXhtmlSpanType()
@@ -26446,9 +26500,9 @@
 	EReference getXhtmlSpanType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getClass_()
 	 * @see #getXhtmlSpanType()
@@ -26457,9 +26511,9 @@
 	EAttribute getXhtmlSpanType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getId <em>Id</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getId()
 	 * @see #getXhtmlSpanType()
@@ -26468,9 +26522,9 @@
 	EAttribute getXhtmlSpanType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getLang()
 	 * @see #getXhtmlSpanType()
@@ -26479,9 +26533,9 @@
 	EAttribute getXhtmlSpanType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSpace()
 	 * @see #getXhtmlSpanType()
@@ -26490,9 +26544,9 @@
 	EAttribute getXhtmlSpanType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getStyle()
 	 * @see #getXhtmlSpanType()
@@ -26501,9 +26555,9 @@
 	EAttribute getXhtmlSpanType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getTitle()
 	 * @see #getXhtmlSpanType()
@@ -26513,8 +26567,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType <em>Strong Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Strong Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType
 	 * @generated
@@ -26522,9 +26576,9 @@
 	EClass getXhtmlStrongType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getMixed()
 	 * @see #getXhtmlStrongType()
@@ -26533,9 +26587,10 @@
 	EAttribute getXhtmlStrongType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getXhtmlInlineMix()
 	 * @see #getXhtmlStrongType()
@@ -26544,9 +26599,10 @@
 	EAttribute getXhtmlStrongType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getBr()
 	 * @see #getXhtmlStrongType()
@@ -26555,9 +26611,10 @@
 	EReference getXhtmlStrongType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSpan()
 	 * @see #getXhtmlStrongType()
@@ -26566,9 +26623,10 @@
 	EReference getXhtmlStrongType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getEm()
 	 * @see #getXhtmlStrongType()
@@ -26577,9 +26635,10 @@
 	EReference getXhtmlStrongType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getStrong()
 	 * @see #getXhtmlStrongType()
@@ -26588,9 +26647,10 @@
 	EReference getXhtmlStrongType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getDfn()
 	 * @see #getXhtmlStrongType()
@@ -26599,9 +26659,10 @@
 	EReference getXhtmlStrongType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getCode()
 	 * @see #getXhtmlStrongType()
@@ -26610,9 +26671,10 @@
 	EReference getXhtmlStrongType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSamp()
 	 * @see #getXhtmlStrongType()
@@ -26621,9 +26683,10 @@
 	EReference getXhtmlStrongType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getKbd()
 	 * @see #getXhtmlStrongType()
@@ -26632,9 +26695,10 @@
 	EReference getXhtmlStrongType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getVar()
 	 * @see #getXhtmlStrongType()
@@ -26643,9 +26707,10 @@
 	EReference getXhtmlStrongType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getCite()
 	 * @see #getXhtmlStrongType()
@@ -26654,9 +26719,10 @@
 	EReference getXhtmlStrongType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getAbbr()
 	 * @see #getXhtmlStrongType()
@@ -26665,9 +26731,10 @@
 	EReference getXhtmlStrongType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getAcronym()
 	 * @see #getXhtmlStrongType()
@@ -26676,9 +26743,10 @@
 	EReference getXhtmlStrongType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getQ()
 	 * @see #getXhtmlStrongType()
@@ -26687,9 +26755,10 @@
 	EReference getXhtmlStrongType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getTt()
 	 * @see #getXhtmlStrongType()
@@ -26698,9 +26767,10 @@
 	EReference getXhtmlStrongType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getI()
 	 * @see #getXhtmlStrongType()
@@ -26709,9 +26779,10 @@
 	EReference getXhtmlStrongType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getB()
 	 * @see #getXhtmlStrongType()
@@ -26720,9 +26791,10 @@
 	EReference getXhtmlStrongType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getBig()
 	 * @see #getXhtmlStrongType()
@@ -26731,9 +26803,10 @@
 	EReference getXhtmlStrongType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSmall()
 	 * @see #getXhtmlStrongType()
@@ -26742,9 +26815,10 @@
 	EReference getXhtmlStrongType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSub()
 	 * @see #getXhtmlStrongType()
@@ -26753,9 +26827,10 @@
 	EReference getXhtmlStrongType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSup()
 	 * @see #getXhtmlStrongType()
@@ -26764,9 +26839,10 @@
 	EReference getXhtmlStrongType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getA()
 	 * @see #getXhtmlStrongType()
@@ -26775,9 +26851,10 @@
 	EReference getXhtmlStrongType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getObject()
 	 * @see #getXhtmlStrongType()
@@ -26786,9 +26863,10 @@
 	EReference getXhtmlStrongType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getIns()
 	 * @see #getXhtmlStrongType()
@@ -26797,9 +26875,10 @@
 	EReference getXhtmlStrongType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getDel()
 	 * @see #getXhtmlStrongType()
@@ -26808,9 +26887,9 @@
 	EReference getXhtmlStrongType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getClass_()
 	 * @see #getXhtmlStrongType()
@@ -26819,9 +26898,9 @@
 	EAttribute getXhtmlStrongType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getId
+	 * <em>Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getId()
 	 * @see #getXhtmlStrongType()
@@ -26830,9 +26909,9 @@
 	EAttribute getXhtmlStrongType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getLang()
 	 * @see #getXhtmlStrongType()
@@ -26841,9 +26920,9 @@
 	EAttribute getXhtmlStrongType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSpace()
 	 * @see #getXhtmlStrongType()
@@ -26852,9 +26931,9 @@
 	EAttribute getXhtmlStrongType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getStyle()
 	 * @see #getXhtmlStrongType()
@@ -26863,9 +26942,9 @@
 	EAttribute getXhtmlStrongType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getTitle()
 	 * @see #getXhtmlStrongType()
@@ -26875,8 +26954,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType <em>Table Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Table Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType
 	 * @generated
@@ -26884,9 +26963,10 @@
 	EClass getXhtmlTableType();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCaption <em>Caption</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCaption <em>Caption</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Caption</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCaption()
 	 * @see #getXhtmlTableType()
@@ -26895,9 +26975,10 @@
 	EReference getXhtmlTableType_Caption();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCol <em>Col</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCol <em>Col</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Col</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCol()
 	 * @see #getXhtmlTableType()
@@ -26906,9 +26987,10 @@
 	EReference getXhtmlTableType_Col();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getColgroup <em>Colgroup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getColgroup <em>Colgroup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Colgroup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getColgroup()
 	 * @see #getXhtmlTableType()
@@ -26917,9 +26999,10 @@
 	EReference getXhtmlTableType_Colgroup();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getThead <em>Thead</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getThead <em>Thead</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Thead</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getThead()
 	 * @see #getXhtmlTableType()
@@ -26928,9 +27011,10 @@
 	EReference getXhtmlTableType_Thead();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTfoot <em>Tfoot</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTfoot <em>Tfoot</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Tfoot</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTfoot()
 	 * @see #getXhtmlTableType()
@@ -26939,9 +27023,10 @@
 	EReference getXhtmlTableType_Tfoot();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTbody <em>Tbody</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTbody <em>Tbody</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tbody</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTbody()
 	 * @see #getXhtmlTableType()
@@ -26950,9 +27035,10 @@
 	EReference getXhtmlTableType_Tbody();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTr <em>Tr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTr <em>Tr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTr()
 	 * @see #getXhtmlTableType()
@@ -26961,9 +27047,9 @@
 	EReference getXhtmlTableType_Tr();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getBorder <em>Border</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getBorder
+	 * <em>Border</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Border</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getBorder()
 	 * @see #getXhtmlTableType()
@@ -26972,9 +27058,9 @@
 	EAttribute getXhtmlTableType_Border();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCellpadding <em>Cellpadding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCellpadding
+	 * <em>Cellpadding</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Cellpadding</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCellpadding()
 	 * @see #getXhtmlTableType()
@@ -26983,9 +27069,9 @@
 	EAttribute getXhtmlTableType_Cellpadding();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCellspacing <em>Cellspacing</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCellspacing
+	 * <em>Cellspacing</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Cellspacing</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCellspacing()
 	 * @see #getXhtmlTableType()
@@ -26994,9 +27080,9 @@
 	EAttribute getXhtmlTableType_Cellspacing();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getClass_()
 	 * @see #getXhtmlTableType()
@@ -27005,9 +27091,9 @@
 	EAttribute getXhtmlTableType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getFrame <em>Frame</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getFrame
+	 * <em>Frame</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Frame</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getFrame()
 	 * @see #getXhtmlTableType()
@@ -27016,9 +27102,9 @@
 	EAttribute getXhtmlTableType_Frame();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getId <em>Id</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getId()
 	 * @see #getXhtmlTableType()
@@ -27027,9 +27113,9 @@
 	EAttribute getXhtmlTableType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getLang()
 	 * @see #getXhtmlTableType()
@@ -27038,9 +27124,9 @@
 	EAttribute getXhtmlTableType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getRules <em>Rules</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getRules
+	 * <em>Rules</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Rules</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getRules()
 	 * @see #getXhtmlTableType()
@@ -27049,9 +27135,9 @@
 	EAttribute getXhtmlTableType_Rules();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getSpace()
 	 * @see #getXhtmlTableType()
@@ -27060,9 +27146,9 @@
 	EAttribute getXhtmlTableType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getStyle()
 	 * @see #getXhtmlTableType()
@@ -27071,9 +27157,9 @@
 	EAttribute getXhtmlTableType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getSummary <em>Summary</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getSummary
+	 * <em>Summary</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Summary</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getSummary()
 	 * @see #getXhtmlTableType()
@@ -27082,9 +27168,9 @@
 	EAttribute getXhtmlTableType_Summary();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTitle()
 	 * @see #getXhtmlTableType()
@@ -27093,9 +27179,9 @@
 	EAttribute getXhtmlTableType_Title();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getWidth <em>Width</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getWidth
+	 * <em>Width</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Width</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getWidth()
 	 * @see #getXhtmlTableType()
@@ -27105,8 +27191,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType <em>Tbody Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Tbody Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType
 	 * @generated
@@ -27114,9 +27200,10 @@
 	EClass getXhtmlTbodyType();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getTr <em>Tr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getTr <em>Tr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getTr()
 	 * @see #getXhtmlTbodyType()
@@ -27125,9 +27212,9 @@
 	EReference getXhtmlTbodyType_Tr();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getAlign <em>Align</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getAlign
+	 * <em>Align</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Align</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getAlign()
 	 * @see #getXhtmlTbodyType()
@@ -27136,9 +27223,9 @@
 	EAttribute getXhtmlTbodyType_Align();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getChar <em>Char</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getChar
+	 * <em>Char</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Char</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getChar()
 	 * @see #getXhtmlTbodyType()
@@ -27147,9 +27234,9 @@
 	EAttribute getXhtmlTbodyType_Char();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getCharoff <em>Charoff</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getCharoff
+	 * <em>Charoff</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Charoff</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getCharoff()
 	 * @see #getXhtmlTbodyType()
@@ -27158,9 +27245,9 @@
 	EAttribute getXhtmlTbodyType_Charoff();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getClass_()
 	 * @see #getXhtmlTbodyType()
@@ -27169,9 +27256,9 @@
 	EAttribute getXhtmlTbodyType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getId <em>Id</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getId()
 	 * @see #getXhtmlTbodyType()
@@ -27180,9 +27267,9 @@
 	EAttribute getXhtmlTbodyType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getLang()
 	 * @see #getXhtmlTbodyType()
@@ -27191,9 +27278,9 @@
 	EAttribute getXhtmlTbodyType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getSpace()
 	 * @see #getXhtmlTbodyType()
@@ -27202,9 +27289,9 @@
 	EAttribute getXhtmlTbodyType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getStyle()
 	 * @see #getXhtmlTbodyType()
@@ -27213,9 +27300,9 @@
 	EAttribute getXhtmlTbodyType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getTitle()
 	 * @see #getXhtmlTbodyType()
@@ -27224,9 +27311,9 @@
 	EAttribute getXhtmlTbodyType_Title();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getValign <em>Valign</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getValign
+	 * <em>Valign</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Valign</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getValign()
 	 * @see #getXhtmlTbodyType()
@@ -27235,9 +27322,9 @@
 	EAttribute getXhtmlTbodyType_Valign();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType <em>Td Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType <em>Td Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Td Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType
 	 * @generated
@@ -27245,9 +27332,9 @@
 	EClass getXhtmlTdType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getMixed()
 	 * @see #getXhtmlTdType()
@@ -27256,9 +27343,9 @@
 	EAttribute getXhtmlTdType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getXhtmlFlowMix
+	 * <em>Xhtml Flow Mix</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Flow Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getXhtmlFlowMix()
 	 * @see #getXhtmlTdType()
@@ -27267,9 +27354,10 @@
 	EAttribute getXhtmlTdType_XhtmlFlowMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH1 <em>H1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH1 <em>H1</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H1</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH1()
 	 * @see #getXhtmlTdType()
@@ -27278,9 +27366,10 @@
 	EReference getXhtmlTdType_H1();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH2 <em>H2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH2 <em>H2</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H2</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH2()
 	 * @see #getXhtmlTdType()
@@ -27289,9 +27378,10 @@
 	EReference getXhtmlTdType_H2();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH3 <em>H3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH3 <em>H3</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H3</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH3()
 	 * @see #getXhtmlTdType()
@@ -27300,9 +27390,10 @@
 	EReference getXhtmlTdType_H3();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH4 <em>H4</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH4 <em>H4</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H4</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH4()
 	 * @see #getXhtmlTdType()
@@ -27311,9 +27402,10 @@
 	EReference getXhtmlTdType_H4();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH5 <em>H5</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH5 <em>H5</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H5</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH5()
 	 * @see #getXhtmlTdType()
@@ -27322,9 +27414,10 @@
 	EReference getXhtmlTdType_H5();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH6 <em>H6</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH6 <em>H6</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H6</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH6()
 	 * @see #getXhtmlTdType()
@@ -27333,9 +27426,10 @@
 	EReference getXhtmlTdType_H6();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getUl <em>Ul</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getUl <em>Ul</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ul</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getUl()
 	 * @see #getXhtmlTdType()
@@ -27344,9 +27438,10 @@
 	EReference getXhtmlTdType_Ul();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getOl <em>Ol</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getOl <em>Ol</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ol</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getOl()
 	 * @see #getXhtmlTdType()
@@ -27355,9 +27450,10 @@
 	EReference getXhtmlTdType_Ol();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDl <em>Dl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDl <em>Dl</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dl</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDl()
 	 * @see #getXhtmlTdType()
@@ -27366,9 +27462,9 @@
 	EReference getXhtmlTdType_Dl();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getP <em>P</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getP <em>P</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>P</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getP()
 	 * @see #getXhtmlTdType()
@@ -27377,9 +27473,10 @@
 	EReference getXhtmlTdType_P();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDiv <em>Div</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDiv <em>Div</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Div</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDiv()
 	 * @see #getXhtmlTdType()
@@ -27388,9 +27485,10 @@
 	EReference getXhtmlTdType_Div();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getPre <em>Pre</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getPre <em>Pre</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Pre</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getPre()
 	 * @see #getXhtmlTdType()
@@ -27399,9 +27497,10 @@
 	EReference getXhtmlTdType_Pre();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getBlockquote <em>Blockquote</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getBlockquote <em>Blockquote</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Blockquote</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getBlockquote()
 	 * @see #getXhtmlTdType()
@@ -27410,9 +27509,10 @@
 	EReference getXhtmlTdType_Blockquote();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAddress <em>Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAddress <em>Address</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Address</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAddress()
 	 * @see #getXhtmlTdType()
@@ -27421,9 +27521,10 @@
 	EReference getXhtmlTdType_Address();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getHr <em>Hr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getHr <em>Hr</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Hr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getHr()
 	 * @see #getXhtmlTdType()
@@ -27432,9 +27533,10 @@
 	EReference getXhtmlTdType_Hr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTable <em>Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTable <em>Table</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Table</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTable()
 	 * @see #getXhtmlTdType()
@@ -27443,9 +27545,10 @@
 	EReference getXhtmlTdType_Table();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getBr()
 	 * @see #getXhtmlTdType()
@@ -27454,9 +27557,10 @@
 	EReference getXhtmlTdType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSpan()
 	 * @see #getXhtmlTdType()
@@ -27465,9 +27569,10 @@
 	EReference getXhtmlTdType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getEm()
 	 * @see #getXhtmlTdType()
@@ -27476,9 +27581,10 @@
 	EReference getXhtmlTdType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getStrong()
 	 * @see #getXhtmlTdType()
@@ -27487,9 +27593,10 @@
 	EReference getXhtmlTdType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDfn()
 	 * @see #getXhtmlTdType()
@@ -27498,9 +27605,10 @@
 	EReference getXhtmlTdType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getCode()
 	 * @see #getXhtmlTdType()
@@ -27509,9 +27617,10 @@
 	EReference getXhtmlTdType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSamp()
 	 * @see #getXhtmlTdType()
@@ -27520,9 +27629,10 @@
 	EReference getXhtmlTdType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getKbd()
 	 * @see #getXhtmlTdType()
@@ -27531,9 +27641,10 @@
 	EReference getXhtmlTdType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getVar()
 	 * @see #getXhtmlTdType()
@@ -27542,9 +27653,10 @@
 	EReference getXhtmlTdType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getCite()
 	 * @see #getXhtmlTdType()
@@ -27553,9 +27665,10 @@
 	EReference getXhtmlTdType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAbbr()
 	 * @see #getXhtmlTdType()
@@ -27564,9 +27677,10 @@
 	EReference getXhtmlTdType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAcronym()
 	 * @see #getXhtmlTdType()
@@ -27575,9 +27689,9 @@
 	EReference getXhtmlTdType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getQ()
 	 * @see #getXhtmlTdType()
@@ -27586,9 +27700,10 @@
 	EReference getXhtmlTdType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTt()
 	 * @see #getXhtmlTdType()
@@ -27597,9 +27712,9 @@
 	EReference getXhtmlTdType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getI()
 	 * @see #getXhtmlTdType()
@@ -27608,9 +27723,9 @@
 	EReference getXhtmlTdType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getB()
 	 * @see #getXhtmlTdType()
@@ -27619,9 +27734,10 @@
 	EReference getXhtmlTdType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getBig()
 	 * @see #getXhtmlTdType()
@@ -27630,9 +27746,10 @@
 	EReference getXhtmlTdType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSmall()
 	 * @see #getXhtmlTdType()
@@ -27641,9 +27758,10 @@
 	EReference getXhtmlTdType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSub()
 	 * @see #getXhtmlTdType()
@@ -27652,9 +27770,10 @@
 	EReference getXhtmlTdType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSup()
 	 * @see #getXhtmlTdType()
@@ -27663,9 +27782,9 @@
 	EReference getXhtmlTdType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getA()
 	 * @see #getXhtmlTdType()
@@ -27674,9 +27793,10 @@
 	EReference getXhtmlTdType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getObject()
 	 * @see #getXhtmlTdType()
@@ -27685,9 +27805,10 @@
 	EReference getXhtmlTdType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getIns()
 	 * @see #getXhtmlTdType()
@@ -27696,9 +27817,10 @@
 	EReference getXhtmlTdType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDel()
 	 * @see #getXhtmlTdType()
@@ -27707,9 +27829,9 @@
 	EReference getXhtmlTdType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAbbr1 <em>Abbr1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAbbr1
+	 * <em>Abbr1</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Abbr1</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAbbr1()
 	 * @see #getXhtmlTdType()
@@ -27718,9 +27840,9 @@
 	EAttribute getXhtmlTdType_Abbr1();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAlign <em>Align</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAlign
+	 * <em>Align</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Align</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAlign()
 	 * @see #getXhtmlTdType()
@@ -27729,9 +27851,9 @@
 	EAttribute getXhtmlTdType_Align();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAxis <em>Axis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAxis
+	 * <em>Axis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Axis</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAxis()
 	 * @see #getXhtmlTdType()
@@ -27740,9 +27862,9 @@
 	EAttribute getXhtmlTdType_Axis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getChar <em>Char</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getChar
+	 * <em>Char</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Char</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getChar()
 	 * @see #getXhtmlTdType()
@@ -27751,9 +27873,9 @@
 	EAttribute getXhtmlTdType_Char();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getCharoff <em>Charoff</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getCharoff
+	 * <em>Charoff</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Charoff</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getCharoff()
 	 * @see #getXhtmlTdType()
@@ -27762,9 +27884,9 @@
 	EAttribute getXhtmlTdType_Charoff();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getClass_()
 	 * @see #getXhtmlTdType()
@@ -27773,9 +27895,9 @@
 	EAttribute getXhtmlTdType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getColspan <em>Colspan</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getColspan
+	 * <em>Colspan</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Colspan</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getColspan()
 	 * @see #getXhtmlTdType()
@@ -27784,9 +27906,9 @@
 	EAttribute getXhtmlTdType_Colspan();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getHeaders <em>Headers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getHeaders
+	 * <em>Headers</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Headers</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getHeaders()
 	 * @see #getXhtmlTdType()
@@ -27796,8 +27918,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getId()
 	 * @see #getXhtmlTdType()
@@ -27806,9 +27928,9 @@
 	EAttribute getXhtmlTdType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getLang()
 	 * @see #getXhtmlTdType()
@@ -27817,9 +27939,9 @@
 	EAttribute getXhtmlTdType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getRowspan <em>Rowspan</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getRowspan
+	 * <em>Rowspan</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Rowspan</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getRowspan()
 	 * @see #getXhtmlTdType()
@@ -27828,9 +27950,9 @@
 	EAttribute getXhtmlTdType_Rowspan();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getScope <em>Scope</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getScope
+	 * <em>Scope</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Scope</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getScope()
 	 * @see #getXhtmlTdType()
@@ -27839,9 +27961,9 @@
 	EAttribute getXhtmlTdType_Scope();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSpace()
 	 * @see #getXhtmlTdType()
@@ -27850,9 +27972,9 @@
 	EAttribute getXhtmlTdType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getStyle()
 	 * @see #getXhtmlTdType()
@@ -27861,9 +27983,9 @@
 	EAttribute getXhtmlTdType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTitle()
 	 * @see #getXhtmlTdType()
@@ -27872,9 +27994,9 @@
 	EAttribute getXhtmlTdType_Title();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getValign <em>Valign</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getValign
+	 * <em>Valign</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Valign</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getValign()
 	 * @see #getXhtmlTdType()
@@ -27884,8 +28006,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType <em>Tfoot Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Tfoot Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType
 	 * @generated
@@ -27893,9 +28015,10 @@
 	EClass getXhtmlTfootType();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getTr <em>Tr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getTr <em>Tr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getTr()
 	 * @see #getXhtmlTfootType()
@@ -27904,9 +28027,9 @@
 	EReference getXhtmlTfootType_Tr();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getAlign <em>Align</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getAlign
+	 * <em>Align</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Align</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getAlign()
 	 * @see #getXhtmlTfootType()
@@ -27915,9 +28038,9 @@
 	EAttribute getXhtmlTfootType_Align();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getChar <em>Char</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getChar
+	 * <em>Char</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Char</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getChar()
 	 * @see #getXhtmlTfootType()
@@ -27926,9 +28049,9 @@
 	EAttribute getXhtmlTfootType_Char();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getCharoff <em>Charoff</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getCharoff
+	 * <em>Charoff</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Charoff</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getCharoff()
 	 * @see #getXhtmlTfootType()
@@ -27937,9 +28060,9 @@
 	EAttribute getXhtmlTfootType_Charoff();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getClass_()
 	 * @see #getXhtmlTfootType()
@@ -27948,9 +28071,9 @@
 	EAttribute getXhtmlTfootType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getId <em>Id</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getId()
 	 * @see #getXhtmlTfootType()
@@ -27959,9 +28082,9 @@
 	EAttribute getXhtmlTfootType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getLang()
 	 * @see #getXhtmlTfootType()
@@ -27970,9 +28093,9 @@
 	EAttribute getXhtmlTfootType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getSpace()
 	 * @see #getXhtmlTfootType()
@@ -27981,9 +28104,9 @@
 	EAttribute getXhtmlTfootType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getStyle()
 	 * @see #getXhtmlTfootType()
@@ -27992,9 +28115,9 @@
 	EAttribute getXhtmlTfootType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getTitle()
 	 * @see #getXhtmlTfootType()
@@ -28003,9 +28126,9 @@
 	EAttribute getXhtmlTfootType_Title();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getValign <em>Valign</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getValign
+	 * <em>Valign</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Valign</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getValign()
 	 * @see #getXhtmlTfootType()
@@ -28015,8 +28138,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType <em>Thead Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Thead Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType
 	 * @generated
@@ -28024,9 +28147,10 @@
 	EClass getXhtmlTheadType();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getTr <em>Tr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getTr <em>Tr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getTr()
 	 * @see #getXhtmlTheadType()
@@ -28035,9 +28159,9 @@
 	EReference getXhtmlTheadType_Tr();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getAlign <em>Align</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getAlign
+	 * <em>Align</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Align</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getAlign()
 	 * @see #getXhtmlTheadType()
@@ -28046,9 +28170,9 @@
 	EAttribute getXhtmlTheadType_Align();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getChar <em>Char</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getChar
+	 * <em>Char</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Char</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getChar()
 	 * @see #getXhtmlTheadType()
@@ -28057,9 +28181,9 @@
 	EAttribute getXhtmlTheadType_Char();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getCharoff <em>Charoff</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getCharoff
+	 * <em>Charoff</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Charoff</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getCharoff()
 	 * @see #getXhtmlTheadType()
@@ -28068,9 +28192,9 @@
 	EAttribute getXhtmlTheadType_Charoff();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getClass_()
 	 * @see #getXhtmlTheadType()
@@ -28079,9 +28203,9 @@
 	EAttribute getXhtmlTheadType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getId <em>Id</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getId()
 	 * @see #getXhtmlTheadType()
@@ -28090,9 +28214,9 @@
 	EAttribute getXhtmlTheadType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getLang()
 	 * @see #getXhtmlTheadType()
@@ -28101,9 +28225,9 @@
 	EAttribute getXhtmlTheadType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getSpace()
 	 * @see #getXhtmlTheadType()
@@ -28112,9 +28236,9 @@
 	EAttribute getXhtmlTheadType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getStyle()
 	 * @see #getXhtmlTheadType()
@@ -28123,9 +28247,9 @@
 	EAttribute getXhtmlTheadType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getTitle()
 	 * @see #getXhtmlTheadType()
@@ -28134,9 +28258,9 @@
 	EAttribute getXhtmlTheadType_Title();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getValign <em>Valign</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getValign
+	 * <em>Valign</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Valign</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getValign()
 	 * @see #getXhtmlTheadType()
@@ -28145,9 +28269,9 @@
 	EAttribute getXhtmlTheadType_Valign();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType <em>Th Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType <em>Th Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Th Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType
 	 * @generated
@@ -28155,9 +28279,9 @@
 	EClass getXhtmlThType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getMixed()
 	 * @see #getXhtmlThType()
@@ -28166,9 +28290,9 @@
 	EAttribute getXhtmlThType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getXhtmlFlowMix
+	 * <em>Xhtml Flow Mix</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Flow Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getXhtmlFlowMix()
 	 * @see #getXhtmlThType()
@@ -28177,9 +28301,10 @@
 	EAttribute getXhtmlThType_XhtmlFlowMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH1 <em>H1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH1 <em>H1</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H1</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH1()
 	 * @see #getXhtmlThType()
@@ -28188,9 +28313,10 @@
 	EReference getXhtmlThType_H1();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH2 <em>H2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH2 <em>H2</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H2</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH2()
 	 * @see #getXhtmlThType()
@@ -28199,9 +28325,10 @@
 	EReference getXhtmlThType_H2();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH3 <em>H3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH3 <em>H3</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H3</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH3()
 	 * @see #getXhtmlThType()
@@ -28210,9 +28337,10 @@
 	EReference getXhtmlThType_H3();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH4 <em>H4</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH4 <em>H4</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H4</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH4()
 	 * @see #getXhtmlThType()
@@ -28221,9 +28349,10 @@
 	EReference getXhtmlThType_H4();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH5 <em>H5</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH5 <em>H5</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H5</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH5()
 	 * @see #getXhtmlThType()
@@ -28232,9 +28361,10 @@
 	EReference getXhtmlThType_H5();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH6 <em>H6</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH6 <em>H6</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>H6</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH6()
 	 * @see #getXhtmlThType()
@@ -28243,9 +28373,10 @@
 	EReference getXhtmlThType_H6();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getUl <em>Ul</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getUl <em>Ul</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ul</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getUl()
 	 * @see #getXhtmlThType()
@@ -28254,9 +28385,10 @@
 	EReference getXhtmlThType_Ul();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getOl <em>Ol</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getOl <em>Ol</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ol</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getOl()
 	 * @see #getXhtmlThType()
@@ -28265,9 +28397,10 @@
 	EReference getXhtmlThType_Ol();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDl <em>Dl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDl <em>Dl</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dl</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDl()
 	 * @see #getXhtmlThType()
@@ -28276,9 +28409,9 @@
 	EReference getXhtmlThType_Dl();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getP <em>P</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getP <em>P</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>P</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getP()
 	 * @see #getXhtmlThType()
@@ -28287,9 +28420,10 @@
 	EReference getXhtmlThType_P();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDiv <em>Div</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDiv <em>Div</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Div</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDiv()
 	 * @see #getXhtmlThType()
@@ -28298,9 +28432,10 @@
 	EReference getXhtmlThType_Div();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getPre <em>Pre</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getPre <em>Pre</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Pre</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getPre()
 	 * @see #getXhtmlThType()
@@ -28309,9 +28444,10 @@
 	EReference getXhtmlThType_Pre();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getBlockquote <em>Blockquote</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getBlockquote <em>Blockquote</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Blockquote</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getBlockquote()
 	 * @see #getXhtmlThType()
@@ -28320,9 +28456,10 @@
 	EReference getXhtmlThType_Blockquote();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAddress <em>Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAddress <em>Address</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Address</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAddress()
 	 * @see #getXhtmlThType()
@@ -28331,9 +28468,10 @@
 	EReference getXhtmlThType_Address();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getHr <em>Hr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getHr <em>Hr</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Hr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getHr()
 	 * @see #getXhtmlThType()
@@ -28342,9 +28480,10 @@
 	EReference getXhtmlThType_Hr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTable <em>Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTable <em>Table</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Table</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTable()
 	 * @see #getXhtmlThType()
@@ -28353,9 +28492,10 @@
 	EReference getXhtmlThType_Table();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getBr()
 	 * @see #getXhtmlThType()
@@ -28364,9 +28504,10 @@
 	EReference getXhtmlThType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSpan()
 	 * @see #getXhtmlThType()
@@ -28375,9 +28516,10 @@
 	EReference getXhtmlThType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getEm()
 	 * @see #getXhtmlThType()
@@ -28386,9 +28528,10 @@
 	EReference getXhtmlThType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getStrong()
 	 * @see #getXhtmlThType()
@@ -28397,9 +28540,10 @@
 	EReference getXhtmlThType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDfn()
 	 * @see #getXhtmlThType()
@@ -28408,9 +28552,10 @@
 	EReference getXhtmlThType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getCode()
 	 * @see #getXhtmlThType()
@@ -28419,9 +28564,10 @@
 	EReference getXhtmlThType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSamp()
 	 * @see #getXhtmlThType()
@@ -28430,9 +28576,10 @@
 	EReference getXhtmlThType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getKbd()
 	 * @see #getXhtmlThType()
@@ -28441,9 +28588,10 @@
 	EReference getXhtmlThType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getVar()
 	 * @see #getXhtmlThType()
@@ -28452,9 +28600,10 @@
 	EReference getXhtmlThType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getCite()
 	 * @see #getXhtmlThType()
@@ -28463,9 +28612,10 @@
 	EReference getXhtmlThType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAbbr()
 	 * @see #getXhtmlThType()
@@ -28474,9 +28624,10 @@
 	EReference getXhtmlThType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAcronym()
 	 * @see #getXhtmlThType()
@@ -28485,9 +28636,9 @@
 	EReference getXhtmlThType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getQ()
 	 * @see #getXhtmlThType()
@@ -28496,9 +28647,10 @@
 	EReference getXhtmlThType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTt()
 	 * @see #getXhtmlThType()
@@ -28507,9 +28659,9 @@
 	EReference getXhtmlThType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getI()
 	 * @see #getXhtmlThType()
@@ -28518,9 +28670,9 @@
 	EReference getXhtmlThType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getB()
 	 * @see #getXhtmlThType()
@@ -28529,9 +28681,10 @@
 	EReference getXhtmlThType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getBig()
 	 * @see #getXhtmlThType()
@@ -28540,9 +28693,10 @@
 	EReference getXhtmlThType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSmall()
 	 * @see #getXhtmlThType()
@@ -28551,9 +28705,10 @@
 	EReference getXhtmlThType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSub()
 	 * @see #getXhtmlThType()
@@ -28562,9 +28717,10 @@
 	EReference getXhtmlThType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSup()
 	 * @see #getXhtmlThType()
@@ -28573,9 +28729,9 @@
 	EReference getXhtmlThType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getA()
 	 * @see #getXhtmlThType()
@@ -28584,9 +28740,10 @@
 	EReference getXhtmlThType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getObject()
 	 * @see #getXhtmlThType()
@@ -28595,9 +28752,10 @@
 	EReference getXhtmlThType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getIns()
 	 * @see #getXhtmlThType()
@@ -28606,9 +28764,10 @@
 	EReference getXhtmlThType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDel()
 	 * @see #getXhtmlThType()
@@ -28617,9 +28776,9 @@
 	EReference getXhtmlThType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAbbr1 <em>Abbr1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAbbr1
+	 * <em>Abbr1</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Abbr1</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAbbr1()
 	 * @see #getXhtmlThType()
@@ -28628,9 +28787,9 @@
 	EAttribute getXhtmlThType_Abbr1();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAlign <em>Align</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAlign
+	 * <em>Align</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Align</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAlign()
 	 * @see #getXhtmlThType()
@@ -28639,9 +28798,9 @@
 	EAttribute getXhtmlThType_Align();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAxis <em>Axis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAxis
+	 * <em>Axis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Axis</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAxis()
 	 * @see #getXhtmlThType()
@@ -28650,9 +28809,9 @@
 	EAttribute getXhtmlThType_Axis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getChar <em>Char</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getChar
+	 * <em>Char</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Char</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getChar()
 	 * @see #getXhtmlThType()
@@ -28661,9 +28820,9 @@
 	EAttribute getXhtmlThType_Char();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getCharoff <em>Charoff</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getCharoff
+	 * <em>Charoff</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Charoff</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getCharoff()
 	 * @see #getXhtmlThType()
@@ -28672,9 +28831,9 @@
 	EAttribute getXhtmlThType_Charoff();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getClass_()
 	 * @see #getXhtmlThType()
@@ -28683,9 +28842,9 @@
 	EAttribute getXhtmlThType_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getColspan <em>Colspan</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getColspan
+	 * <em>Colspan</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Colspan</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getColspan()
 	 * @see #getXhtmlThType()
@@ -28694,9 +28853,9 @@
 	EAttribute getXhtmlThType_Colspan();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getHeaders <em>Headers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getHeaders
+	 * <em>Headers</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Headers</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getHeaders()
 	 * @see #getXhtmlThType()
@@ -28706,8 +28865,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getId()
 	 * @see #getXhtmlThType()
@@ -28716,9 +28875,9 @@
 	EAttribute getXhtmlThType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getLang()
 	 * @see #getXhtmlThType()
@@ -28727,9 +28886,9 @@
 	EAttribute getXhtmlThType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getRowspan <em>Rowspan</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getRowspan
+	 * <em>Rowspan</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Rowspan</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getRowspan()
 	 * @see #getXhtmlThType()
@@ -28738,9 +28897,9 @@
 	EAttribute getXhtmlThType_Rowspan();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getScope <em>Scope</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getScope
+	 * <em>Scope</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Scope</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getScope()
 	 * @see #getXhtmlThType()
@@ -28749,9 +28908,9 @@
 	EAttribute getXhtmlThType_Scope();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSpace()
 	 * @see #getXhtmlThType()
@@ -28760,9 +28919,9 @@
 	EAttribute getXhtmlThType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getStyle()
 	 * @see #getXhtmlThType()
@@ -28771,9 +28930,9 @@
 	EAttribute getXhtmlThType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTitle()
 	 * @see #getXhtmlThType()
@@ -28782,9 +28941,9 @@
 	EAttribute getXhtmlThType_Title();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getValign <em>Valign</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getValign
+	 * <em>Valign</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Valign</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getValign()
 	 * @see #getXhtmlThType()
@@ -28793,9 +28952,9 @@
 	EAttribute getXhtmlThType_Valign();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType <em>Tr Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType <em>Tr Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Tr Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTrType
 	 * @generated
@@ -28803,9 +28962,9 @@
 	EClass getXhtmlTrType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getGroup <em>Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getGroup
+	 * <em>Group</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Group</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getGroup()
 	 * @see #getXhtmlTrType()
@@ -28814,9 +28973,10 @@
 	EAttribute getXhtmlTrType_Group();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTh <em>Th</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTh <em>Th</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Th</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTh()
 	 * @see #getXhtmlTrType()
@@ -28825,9 +28985,10 @@
 	EReference getXhtmlTrType_Th();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTd <em>Td</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTd <em>Td</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Td</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTd()
 	 * @see #getXhtmlTrType()
@@ -28836,9 +28997,9 @@
 	EReference getXhtmlTrType_Td();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getAlign <em>Align</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getAlign
+	 * <em>Align</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Align</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getAlign()
 	 * @see #getXhtmlTrType()
@@ -28847,9 +29008,9 @@
 	EAttribute getXhtmlTrType_Align();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getChar <em>Char</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getChar
+	 * <em>Char</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Char</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getChar()
 	 * @see #getXhtmlTrType()
@@ -28858,9 +29019,9 @@
 	EAttribute getXhtmlTrType_Char();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getCharoff <em>Charoff</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getCharoff
+	 * <em>Charoff</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Charoff</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getCharoff()
 	 * @see #getXhtmlTrType()
@@ -28869,9 +29030,9 @@
 	EAttribute getXhtmlTrType_Charoff();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getClass_()
 	 * @see #getXhtmlTrType()
@@ -28881,8 +29042,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getId()
 	 * @see #getXhtmlTrType()
@@ -28891,9 +29052,9 @@
 	EAttribute getXhtmlTrType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getLang()
 	 * @see #getXhtmlTrType()
@@ -28902,9 +29063,9 @@
 	EAttribute getXhtmlTrType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getSpace()
 	 * @see #getXhtmlTrType()
@@ -28913,9 +29074,9 @@
 	EAttribute getXhtmlTrType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getStyle()
 	 * @see #getXhtmlTrType()
@@ -28924,9 +29085,9 @@
 	EAttribute getXhtmlTrType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTitle()
 	 * @see #getXhtmlTrType()
@@ -28935,9 +29096,9 @@
 	EAttribute getXhtmlTrType_Title();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getValign <em>Valign</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getValign
+	 * <em>Valign</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Valign</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getValign()
 	 * @see #getXhtmlTrType()
@@ -28946,9 +29107,9 @@
 	EAttribute getXhtmlTrType_Valign();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType <em>Ul Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType <em>Ul Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Ul Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlUlType
 	 * @generated
@@ -28956,9 +29117,10 @@
 	EClass getXhtmlUlType();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getLi <em>Li</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getLi <em>Li</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Li</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getLi()
 	 * @see #getXhtmlUlType()
@@ -28967,9 +29129,9 @@
 	EReference getXhtmlUlType_Li();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getClass_()
 	 * @see #getXhtmlUlType()
@@ -28979,8 +29141,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getId()
 	 * @see #getXhtmlUlType()
@@ -28989,9 +29151,9 @@
 	EAttribute getXhtmlUlType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getLang()
 	 * @see #getXhtmlUlType()
@@ -29000,9 +29162,9 @@
 	EAttribute getXhtmlUlType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getSpace()
 	 * @see #getXhtmlUlType()
@@ -29011,9 +29173,9 @@
 	EAttribute getXhtmlUlType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getStyle()
 	 * @see #getXhtmlUlType()
@@ -29022,9 +29184,9 @@
 	EAttribute getXhtmlUlType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getTitle()
 	 * @see #getXhtmlUlType()
@@ -29033,9 +29195,9 @@
 	EAttribute getXhtmlUlType_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType <em>Var Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType <em>Var Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Var Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType
 	 * @generated
@@ -29043,9 +29205,9 @@
 	EClass getXhtmlVarType();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getMixed
+	 * <em>Mixed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Mixed</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getMixed()
 	 * @see #getXhtmlVarType()
@@ -29054,9 +29216,10 @@
 	EAttribute getXhtmlVarType_Mixed();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Xhtml Inline Mix</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getXhtmlInlineMix()
 	 * @see #getXhtmlVarType()
@@ -29065,9 +29228,10 @@
 	EAttribute getXhtmlVarType_XhtmlInlineMix();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getBr <em>Br</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getBr <em>Br</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Br</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getBr()
 	 * @see #getXhtmlVarType()
@@ -29076,9 +29240,10 @@
 	EReference getXhtmlVarType_Br();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSpan <em>Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSpan <em>Span</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Span</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSpan()
 	 * @see #getXhtmlVarType()
@@ -29087,9 +29252,10 @@
 	EReference getXhtmlVarType_Span();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getEm <em>Em</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getEm <em>Em</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Em</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getEm()
 	 * @see #getXhtmlVarType()
@@ -29098,9 +29264,10 @@
 	EReference getXhtmlVarType_Em();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getStrong <em>Strong</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getStrong <em>Strong</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Strong</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getStrong()
 	 * @see #getXhtmlVarType()
@@ -29109,9 +29276,10 @@
 	EReference getXhtmlVarType_Strong();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getDfn <em>Dfn</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getDfn <em>Dfn</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Dfn</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getDfn()
 	 * @see #getXhtmlVarType()
@@ -29120,9 +29288,10 @@
 	EReference getXhtmlVarType_Dfn();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getCode <em>Code</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Code</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getCode()
 	 * @see #getXhtmlVarType()
@@ -29131,9 +29300,10 @@
 	EReference getXhtmlVarType_Code();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSamp <em>Samp</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSamp <em>Samp</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Samp</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSamp()
 	 * @see #getXhtmlVarType()
@@ -29142,9 +29312,10 @@
 	EReference getXhtmlVarType_Samp();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getKbd <em>Kbd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getKbd <em>Kbd</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Kbd</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getKbd()
 	 * @see #getXhtmlVarType()
@@ -29153,9 +29324,10 @@
 	EReference getXhtmlVarType_Kbd();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getVar <em>Var</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getVar <em>Var</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Var</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getVar()
 	 * @see #getXhtmlVarType()
@@ -29164,9 +29336,10 @@
 	EReference getXhtmlVarType_Var();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getCite <em>Cite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getCite <em>Cite</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cite</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getCite()
 	 * @see #getXhtmlVarType()
@@ -29175,9 +29348,10 @@
 	EReference getXhtmlVarType_Cite();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getAbbr <em>Abbr</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getAbbr <em>Abbr</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Abbr</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getAbbr()
 	 * @see #getXhtmlVarType()
@@ -29186,9 +29360,10 @@
 	EReference getXhtmlVarType_Abbr();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getAcronym <em>Acronym</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getAcronym <em>Acronym</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Acronym</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getAcronym()
 	 * @see #getXhtmlVarType()
@@ -29197,9 +29372,10 @@
 	EReference getXhtmlVarType_Acronym();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getQ <em>Q</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getQ <em>Q</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Q</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getQ()
 	 * @see #getXhtmlVarType()
@@ -29208,9 +29384,10 @@
 	EReference getXhtmlVarType_Q();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getTt <em>Tt</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getTt <em>Tt</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tt</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getTt()
 	 * @see #getXhtmlVarType()
@@ -29219,9 +29396,10 @@
 	EReference getXhtmlVarType_Tt();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getI <em>I</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getI <em>I</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>I</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getI()
 	 * @see #getXhtmlVarType()
@@ -29230,9 +29408,10 @@
 	EReference getXhtmlVarType_I();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getB <em>B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getB <em>B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>B</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getB()
 	 * @see #getXhtmlVarType()
@@ -29241,9 +29420,10 @@
 	EReference getXhtmlVarType_B();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getBig <em>Big</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getBig <em>Big</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Big</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getBig()
 	 * @see #getXhtmlVarType()
@@ -29252,9 +29432,10 @@
 	EReference getXhtmlVarType_Big();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSmall <em>Small</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSmall <em>Small</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Small</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSmall()
 	 * @see #getXhtmlVarType()
@@ -29263,9 +29444,10 @@
 	EReference getXhtmlVarType_Small();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSub <em>Sub</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSub <em>Sub</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSub()
 	 * @see #getXhtmlVarType()
@@ -29274,9 +29456,10 @@
 	EReference getXhtmlVarType_Sub();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSup <em>Sup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSup <em>Sup</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sup</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSup()
 	 * @see #getXhtmlVarType()
@@ -29285,9 +29468,10 @@
 	EReference getXhtmlVarType_Sup();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getA <em>A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getA <em>A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>A</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getA()
 	 * @see #getXhtmlVarType()
@@ -29296,9 +29480,10 @@
 	EReference getXhtmlVarType_A();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getObject <em>Object</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getObject()
 	 * @see #getXhtmlVarType()
@@ -29307,9 +29492,10 @@
 	EReference getXhtmlVarType_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getIns <em>Ins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getIns <em>Ins</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ins</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getIns()
 	 * @see #getXhtmlVarType()
@@ -29318,9 +29504,10 @@
 	EReference getXhtmlVarType_Ins();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getDel <em>Del</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getDel <em>Del</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Del</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getDel()
 	 * @see #getXhtmlVarType()
@@ -29329,9 +29516,9 @@
 	EReference getXhtmlVarType_Del();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getClass_
+	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getClass_()
 	 * @see #getXhtmlVarType()
@@ -29341,8 +29528,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getId()
 	 * @see #getXhtmlVarType()
@@ -29351,9 +29538,9 @@
 	EAttribute getXhtmlVarType_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getLang
+	 * <em>Lang</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getLang()
 	 * @see #getXhtmlVarType()
@@ -29362,9 +29549,9 @@
 	EAttribute getXhtmlVarType_Lang();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSpace <em>Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSpace
+	 * <em>Space</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Space</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSpace()
 	 * @see #getXhtmlVarType()
@@ -29373,9 +29560,9 @@
 	EAttribute getXhtmlVarType_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getStyle
+	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Style</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getStyle()
 	 * @see #getXhtmlVarType()
@@ -29384,9 +29571,9 @@
 	EAttribute getXhtmlVarType_Style();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getTitle
+	 * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getTitle()
 	 * @see #getXhtmlVarType()
@@ -29395,9 +29582,9 @@
 	EAttribute getXhtmlVarType_Title();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.rmf.reqif10.xhtml.AlignType <em>Align Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum '{@link org.eclipse.rmf.reqif10.xhtml.AlignType <em>Align Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Align Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @generated
@@ -29405,9 +29592,9 @@
 	EEnum getAlignType();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.rmf.reqif10.xhtml.DeclareType <em>Declare Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum '{@link org.eclipse.rmf.reqif10.xhtml.DeclareType <em>Declare Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Declare Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.DeclareType
 	 * @generated
@@ -29415,9 +29602,9 @@
 	EEnum getDeclareType();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.rmf.reqif10.xhtml.FrameType <em>Frame Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum '{@link org.eclipse.rmf.reqif10.xhtml.FrameType <em>Frame Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Frame Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.FrameType
 	 * @generated
@@ -29425,9 +29612,9 @@
 	EEnum getFrameType();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.rmf.reqif10.xhtml.RulesType <em>Rules Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum '{@link org.eclipse.rmf.reqif10.xhtml.RulesType <em>Rules Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Rules Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.RulesType
 	 * @generated
@@ -29435,9 +29622,9 @@
 	EEnum getRulesType();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.rmf.reqif10.xhtml.ScopeType <em>Scope Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum '{@link org.eclipse.rmf.reqif10.xhtml.ScopeType <em>Scope Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Scope Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ScopeType
 	 * @generated
@@ -29445,9 +29632,9 @@
 	EEnum getScopeType();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.rmf.reqif10.xhtml.ValignType <em>Valign Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum '{@link org.eclipse.rmf.reqif10.xhtml.ValignType <em>Valign Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Valign Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @generated
@@ -29456,8 +29643,8 @@
 
 	/**
 	 * Returns the meta object for enum '{@link org.eclipse.rmf.reqif10.xhtml.ValuetypeType <em>Valuetype Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Valuetype Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValuetypeType
 	 * @generated
@@ -29465,9 +29652,9 @@
 	EEnum getValuetypeType();
 
 	/**
-	 * Returns the meta object for data type '{@link org.eclipse.rmf.reqif10.xhtml.AlignType <em>Align Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link org.eclipse.rmf.reqif10.xhtml.AlignType <em>Align Type Object</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Align Type Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @model instanceClass="org.eclipse.rmf.reqif10.xhtml.AlignType"
@@ -29477,9 +29664,9 @@
 	EDataType getAlignTypeObject();
 
 	/**
-	 * Returns the meta object for data type '{@link org.eclipse.rmf.reqif10.xhtml.DeclareType <em>Declare Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link org.eclipse.rmf.reqif10.xhtml.DeclareType
+	 * <em>Declare Type Object</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Declare Type Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.DeclareType
 	 * @model instanceClass="org.eclipse.rmf.reqif10.xhtml.DeclareType"
@@ -29489,9 +29676,9 @@
 	EDataType getDeclareTypeObject();
 
 	/**
-	 * Returns the meta object for data type '{@link org.eclipse.rmf.reqif10.xhtml.FrameType <em>Frame Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link org.eclipse.rmf.reqif10.xhtml.FrameType <em>Frame Type Object</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Frame Type Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.FrameType
 	 * @model instanceClass="org.eclipse.rmf.reqif10.xhtml.FrameType"
@@ -29501,9 +29688,9 @@
 	EDataType getFrameTypeObject();
 
 	/**
-	 * Returns the meta object for data type '{@link org.eclipse.rmf.reqif10.xhtml.RulesType <em>Rules Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link org.eclipse.rmf.reqif10.xhtml.RulesType <em>Rules Type Object</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Rules Type Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.RulesType
 	 * @model instanceClass="org.eclipse.rmf.reqif10.xhtml.RulesType"
@@ -29513,9 +29700,9 @@
 	EDataType getRulesTypeObject();
 
 	/**
-	 * Returns the meta object for data type '{@link org.eclipse.rmf.reqif10.xhtml.ScopeType <em>Scope Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link org.eclipse.rmf.reqif10.xhtml.ScopeType <em>Scope Type Object</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Scope Type Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ScopeType
 	 * @model instanceClass="org.eclipse.rmf.reqif10.xhtml.ScopeType"
@@ -29525,9 +29712,9 @@
 	EDataType getScopeTypeObject();
 
 	/**
-	 * Returns the meta object for data type '{@link org.eclipse.rmf.reqif10.xhtml.ValignType <em>Valign Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link org.eclipse.rmf.reqif10.xhtml.ValignType
+	 * <em>Valign Type Object</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Valign Type Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @model instanceClass="org.eclipse.rmf.reqif10.xhtml.ValignType"
@@ -29537,9 +29724,9 @@
 	EDataType getValignTypeObject();
 
 	/**
-	 * Returns the meta object for data type '{@link org.eclipse.rmf.reqif10.xhtml.ValuetypeType <em>Valuetype Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link org.eclipse.rmf.reqif10.xhtml.ValuetypeType
+	 * <em>Valuetype Type Object</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Valuetype Type Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValuetypeType
 	 * @model instanceClass="org.eclipse.rmf.reqif10.xhtml.ValuetypeType"
@@ -29549,12 +29736,11 @@
 	EDataType getValuetypeTypeObject();
 
 	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
 	XhtmlFactory getXhtmlFactory();
 
-} //XhtmlPackage
+} // XhtmlPackage
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlParamType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlParamType.java
index b18862a..bf6824c 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlParamType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlParamType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,61 +14,56 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Param Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Param Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValuetype <em>Valuetype</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValuetype <em>Valuetype</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlParamType()
  * @model extendedMetaData="name='param' kind='elementOnly'"
  * @generated
  */
 public interface XhtmlParamType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlParamType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlParamType_Name()
@@ -80,95 +75,94 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
 	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' attribute.
 	 * @see #setType(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlParamType_Type()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.ContentType"
-	 *        extendedMetaData="kind='attribute' name='type'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.ContentType" extendedMetaData="kind='attribute' name='type'"
 	 * @generated
 	 */
 	String getType();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Type</em>' attribute.
 	 * @see #getType()
 	 * @generated
 	 */
 	void setType(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlParamType_Value()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='value'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='value'"
 	 * @generated
 	 */
 	String getValue();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
 	void setValue(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Valuetype</b></em>' attribute.
-	 * The default value is <code>"data"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.ValuetypeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Valuetype</b></em>' attribute. The default value is <code>"data"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.ValuetypeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Valuetype</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Valuetype</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Valuetype</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValuetypeType
 	 * @see #isSetValuetype()
 	 * @see #unsetValuetype()
 	 * @see #setValuetype(ValuetypeType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlParamType_Valuetype()
-	 * @model default="data" unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='valuetype'"
+	 * @model default="data" unsettable="true" extendedMetaData="kind='attribute' name='valuetype'"
 	 * @generated
 	 */
 	ValuetypeType getValuetype();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValuetype <em>Valuetype</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Valuetype</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValuetype <em>Valuetype</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Valuetype</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValuetypeType
 	 * @see #isSetValuetype()
 	 * @see #unsetValuetype()
@@ -178,9 +172,9 @@
 	void setValuetype(ValuetypeType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValuetype <em>Valuetype</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValuetype <em>Valuetype</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetValuetype()
 	 * @see #getValuetype()
 	 * @see #setValuetype(ValuetypeType)
@@ -189,9 +183,9 @@
 	void unsetValuetype();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValuetype <em>Valuetype</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType#getValuetype
+	 * <em>Valuetype</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Valuetype</em>' attribute is set.
 	 * @see #unsetValuetype()
 	 * @see #getValuetype()
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlPreType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlPreType.java
index 6b933ae..cd2a287 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlPreType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlPreType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,65 +12,59 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Pre Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Pre Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getXhtmlInlinePreMix <em>Xhtml Inline Pre Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getXhtmlInlinePreMix <em>Xhtml Inline Pre Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType()
  * @model extendedMetaData="name='pre' kind='mixed'"
  * @generated
  */
 public interface XhtmlPreType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -80,31 +74,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Pre Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Pre Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Pre Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Pre Mix</em>' attribute list isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Pre Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_XhtmlInlinePreMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlinePreMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlinePreMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlinePreMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -114,14 +108,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -131,14 +125,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -148,14 +142,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -165,14 +159,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -182,14 +176,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -199,14 +193,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -216,14 +210,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -233,14 +227,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -250,14 +244,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -267,14 +261,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -284,14 +278,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -301,14 +295,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -318,14 +312,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -335,14 +329,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -352,14 +346,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -369,14 +363,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -386,14 +380,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -403,14 +397,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -420,97 +414,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Lang()
@@ -521,36 +499,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -565,9 +535,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -578,8 +549,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -588,9 +559,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -600,54 +571,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlPreType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlQType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlQType.java
index 2eef4c9..9932200 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlQType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlQType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,71 +12,65 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>QType</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>QType</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCite1 <em>Cite1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCite1 <em>Cite1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType()
  * @model extendedMetaData="name='q' kind='mixed'"
  * @generated
  */
 public interface XhtmlQType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -86,31 +80,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -120,14 +114,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -137,14 +131,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -154,14 +148,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -171,14 +165,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -188,14 +182,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -205,14 +199,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -222,14 +216,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -239,14 +233,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -256,14 +250,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -273,14 +267,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -290,14 +284,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -307,14 +301,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -324,14 +318,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -341,14 +335,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -358,14 +352,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -375,14 +369,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -392,14 +386,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -409,14 +403,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -426,14 +420,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -443,14 +437,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -460,14 +454,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -477,14 +471,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -494,14 +488,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -511,124 +505,108 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Cite1</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite1</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite1</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite1</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite1</em>' attribute.
 	 * @see #setCite1(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Cite1()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.URI"
-	 *        extendedMetaData="kind='attribute' name='cite'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.URI" extendedMetaData="kind='attribute' name='cite'"
 	 * @generated
 	 */
 	String getCite1();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCite1 <em>Cite1</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cite1</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getCite1 <em>Cite1</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Cite1</em>' attribute.
 	 * @see #getCite1()
 	 * @generated
 	 */
 	void setCite1(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getClass_ <em>Class</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Lang()
@@ -639,36 +617,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -682,10 +652,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -696,8 +667,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -706,9 +677,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -718,54 +689,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlQType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlSampType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlSampType.java
index 15d49f7..3e71aa1 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlSampType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlSampType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Samp Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Samp Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType()
  * @model extendedMetaData="name='samp' kind='mixed'"
  * @generated
  */
 public interface XhtmlSampType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -655,9 +625,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSampType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlSpanType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlSpanType.java
index dbcacbd..ec0b6d4 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlSpanType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlSpanType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Span Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Span Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType()
  * @model extendedMetaData="name='span' kind='mixed'"
  * @generated
  */
 public interface XhtmlSpanType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -655,9 +625,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlSpanType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlStrongType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlStrongType.java
index 37f8616..6459554 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlStrongType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlStrongType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Strong Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Strong Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType()
  * @model extendedMetaData="name='strong' kind='mixed'"
  * @generated
  */
 public interface XhtmlStrongType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Lang()
@@ -612,35 +590,27 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -655,9 +625,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -667,9 +638,9 @@
 	void setSpace(SpaceType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSpace <em>Space</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlStrongType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTableType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTableType.java
index 6d38fee..98c4c56 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTableType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTableType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,330 +14,321 @@
 import java.math.BigInteger;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Table Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Table Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCaption <em>Caption</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCol <em>Col</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getColgroup <em>Colgroup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getThead <em>Thead</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTfoot <em>Tfoot</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTbody <em>Tbody</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTr <em>Tr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getBorder <em>Border</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCellpadding <em>Cellpadding</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCellspacing <em>Cellspacing</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getFrame <em>Frame</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getRules <em>Rules</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getSummary <em>Summary</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCaption <em>Caption</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCol <em>Col</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getColgroup <em>Colgroup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getThead <em>Thead</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTfoot <em>Tfoot</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTbody <em>Tbody</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTr <em>Tr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getBorder <em>Border</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCellpadding <em>Cellpadding</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCellspacing <em>Cellspacing</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getFrame <em>Frame</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getRules <em>Rules</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getSummary <em>Summary</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getWidth <em>Width</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType()
  * @model extendedMetaData="name='table' kind='elementOnly'"
  * @generated
  */
 public interface XhtmlTableType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Caption</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Caption</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Caption</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Caption</em>' containment reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Caption</em>' containment reference.
 	 * @see #setCaption(XhtmlCaptionType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Caption()
-	 * @model containment="true"
-	 *        extendedMetaData="kind='element' name='caption' namespace='##targetNamespace'"
+	 * @model containment="true" extendedMetaData="kind='element' name='caption' namespace='##targetNamespace'"
 	 * @generated
 	 */
 	XhtmlCaptionType getCaption();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCaption <em>Caption</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Caption</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCaption <em>Caption</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Caption</em>' containment reference.
 	 * @see #getCaption()
 	 * @generated
 	 */
 	void setCaption(XhtmlCaptionType value);
 
 	/**
-	 * Returns the value of the '<em><b>Col</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Col</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Col</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Col</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Col</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Col()
-	 * @model containment="true"
-	 *        extendedMetaData="kind='element' name='col' namespace='##targetNamespace'"
+	 * @model containment="true" extendedMetaData="kind='element' name='col' namespace='##targetNamespace'"
 	 * @generated
 	 */
 	EList<XhtmlColType> getCol();
 
 	/**
-	 * Returns the value of the '<em><b>Colgroup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Colgroup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Colgroup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Colgroup</em>' containment reference list isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Colgroup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Colgroup()
-	 * @model containment="true"
-	 *        extendedMetaData="kind='element' name='colgroup' namespace='##targetNamespace'"
+	 * @model containment="true" extendedMetaData="kind='element' name='colgroup' namespace='##targetNamespace'"
 	 * @generated
 	 */
 	EList<XhtmlColgroupType> getColgroup();
 
 	/**
-	 * Returns the value of the '<em><b>Thead</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Thead</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Thead</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Thead</em>' containment reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Thead</em>' containment reference.
 	 * @see #setThead(XhtmlTheadType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Thead()
-	 * @model containment="true"
-	 *        extendedMetaData="kind='element' name='thead' namespace='##targetNamespace'"
+	 * @model containment="true" extendedMetaData="kind='element' name='thead' namespace='##targetNamespace'"
 	 * @generated
 	 */
 	XhtmlTheadType getThead();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getThead <em>Thead</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Thead</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getThead <em>Thead</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Thead</em>' containment reference.
 	 * @see #getThead()
 	 * @generated
 	 */
 	void setThead(XhtmlTheadType value);
 
 	/**
-	 * Returns the value of the '<em><b>Tfoot</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tfoot</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tfoot</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tfoot</em>' containment reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tfoot</em>' containment reference.
 	 * @see #setTfoot(XhtmlTfootType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Tfoot()
-	 * @model containment="true"
-	 *        extendedMetaData="kind='element' name='tfoot' namespace='##targetNamespace'"
+	 * @model containment="true" extendedMetaData="kind='element' name='tfoot' namespace='##targetNamespace'"
 	 * @generated
 	 */
 	XhtmlTfootType getTfoot();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTfoot <em>Tfoot</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Tfoot</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTfoot <em>Tfoot</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Tfoot</em>' containment reference.
 	 * @see #getTfoot()
 	 * @generated
 	 */
 	void setTfoot(XhtmlTfootType value);
 
 	/**
-	 * Returns the value of the '<em><b>Tbody</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tbody</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tbody</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tbody</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tbody</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Tbody()
-	 * @model containment="true"
-	 *        extendedMetaData="kind='element' name='tbody' namespace='##targetNamespace'"
+	 * @model containment="true" extendedMetaData="kind='element' name='tbody' namespace='##targetNamespace'"
 	 * @generated
 	 */
 	EList<XhtmlTbodyType> getTbody();
 
 	/**
-	 * Returns the value of the '<em><b>Tr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Tr()
-	 * @model containment="true"
-	 *        extendedMetaData="kind='element' name='tr' namespace='##targetNamespace'"
+	 * @model containment="true" extendedMetaData="kind='element' name='tr' namespace='##targetNamespace'"
 	 * @generated
 	 */
 	EList<XhtmlTrType> getTr();
 
 	/**
-	 * Returns the value of the '<em><b>Border</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Border</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Border</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Border</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Border</em>' attribute.
 	 * @see #setBorder(BigInteger)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Border()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Pixels"
-	 *        extendedMetaData="kind='attribute' name='border'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Pixels" extendedMetaData="kind='attribute' name='border'"
 	 * @generated
 	 */
 	BigInteger getBorder();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getBorder <em>Border</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Border</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Border</em>' attribute.
 	 * @see #getBorder()
 	 * @generated
 	 */
 	void setBorder(BigInteger value);
 
 	/**
-	 * Returns the value of the '<em><b>Cellpadding</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cellpadding</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cellpadding</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cellpadding</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cellpadding</em>' attribute.
 	 * @see #setCellpadding(Object)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Cellpadding()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length"
-	 *        extendedMetaData="kind='attribute' name='cellpadding'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length" extendedMetaData="kind='attribute' name='cellpadding'"
 	 * @generated
 	 */
 	Object getCellpadding();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCellpadding <em>Cellpadding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cellpadding</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCellpadding <em>Cellpadding</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Cellpadding</em>' attribute.
 	 * @see #getCellpadding()
 	 * @generated
 	 */
 	void setCellpadding(Object value);
 
 	/**
-	 * Returns the value of the '<em><b>Cellspacing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cellspacing</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cellspacing</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cellspacing</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cellspacing</em>' attribute.
 	 * @see #setCellspacing(Object)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Cellspacing()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length"
-	 *        extendedMetaData="kind='attribute' name='cellspacing'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length" extendedMetaData="kind='attribute' name='cellspacing'"
 	 * @generated
 	 */
 	Object getCellspacing();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCellspacing <em>Cellspacing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cellspacing</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getCellspacing <em>Cellspacing</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Cellspacing</em>' attribute.
 	 * @see #getCellspacing()
 	 * @generated
 	 */
 	void setCellspacing(Object value);
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Frame</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.FrameType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Frame</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.FrameType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Frame</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Frame</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Frame</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.FrameType
 	 * @see #isSetFrame()
 	 * @see #unsetFrame()
 	 * @see #setFrame(FrameType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Frame()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='frame'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='frame'"
 	 * @generated
 	 */
 	FrameType getFrame();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getFrame <em>Frame</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Frame</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Frame</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.FrameType
 	 * @see #isSetFrame()
 	 * @see #unsetFrame()
@@ -348,8 +339,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getFrame <em>Frame</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetFrame()
 	 * @see #getFrame()
 	 * @see #setFrame(FrameType)
@@ -358,9 +349,9 @@
 	void unsetFrame();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getFrame <em>Frame</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getFrame <em>Frame</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Frame</em>' attribute is set.
 	 * @see #unsetFrame()
 	 * @see #getFrame()
@@ -370,70 +361,54 @@
 	boolean isSetFrame();
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Lang()
@@ -445,40 +420,41 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Rules</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.RulesType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Rules</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.RulesType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Rules</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Rules</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Rules</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.RulesType
 	 * @see #isSetRules()
 	 * @see #unsetRules()
 	 * @see #setRules(RulesType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Rules()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='rules'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='rules'"
 	 * @generated
 	 */
 	RulesType getRules();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getRules <em>Rules</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rules</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Rules</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.RulesType
 	 * @see #isSetRules()
 	 * @see #unsetRules()
@@ -489,8 +465,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getRules <em>Rules</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetRules()
 	 * @see #getRules()
 	 * @see #setRules(RulesType)
@@ -499,9 +475,9 @@
 	void unsetRules();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getRules <em>Rules</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getRules <em>Rules</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Rules</em>' attribute is set.
 	 * @see #unsetRules()
 	 * @see #getRules()
@@ -511,26 +487,17 @@
 	boolean isSetRules();
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -545,9 +512,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -558,8 +526,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -568,9 +536,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -580,108 +548,108 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Summary</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Summary</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Summary</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Summary</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Summary</em>' attribute.
 	 * @see #setSummary(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Summary()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Text"
-	 *        extendedMetaData="kind='attribute' name='summary'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Text" extendedMetaData="kind='attribute' name='summary'"
 	 * @generated
 	 */
 	String getSummary();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getSummary <em>Summary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Summary</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getSummary <em>Summary</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Summary</em>' attribute.
 	 * @see #getSummary()
 	 * @generated
 	 */
 	void setSummary(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
 	void setTitle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Width</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Width</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Width</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Width</em>' attribute.
 	 * @see #setWidth(Object)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTableType_Width()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length"
-	 *        extendedMetaData="kind='attribute' name='width'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length" extendedMetaData="kind='attribute' name='width'"
 	 * @generated
 	 */
 	Object getWidth();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType#getWidth <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Width</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Width</em>' attribute.
 	 * @see #getWidth()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTbodyType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTbodyType.java
index 4fba334..6229ce8 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTbodyType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTbodyType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,47 +12,42 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tbody Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Tbody Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getTr <em>Tr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getAlign <em>Align</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getChar <em>Char</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getCharoff <em>Charoff</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getValign <em>Valign</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getTr <em>Tr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getAlign <em>Align</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getChar <em>Char</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getCharoff <em>Charoff</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getValign <em>Valign</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTbodyType()
  * @model extendedMetaData="name='tbody' kind='elementOnly'"
  * @generated
  */
 public interface XhtmlTbodyType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Tr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTbodyType_Tr()
 	 * @model containment="true" required="true"
@@ -62,31 +57,31 @@
 	EList<XhtmlTrType> getTr();
 
 	/**
-	 * Returns the value of the '<em><b>Align</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.AlignType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Align</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.AlignType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Align</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Align</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Align</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see #isSetAlign()
 	 * @see #unsetAlign()
 	 * @see #setAlign(AlignType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTbodyType_Align()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='align'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='align'"
 	 * @generated
 	 */
 	AlignType getAlign();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getAlign <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Align</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Align</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see #isSetAlign()
 	 * @see #unsetAlign()
@@ -97,8 +92,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getAlign <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetAlign()
 	 * @see #getAlign()
 	 * @see #setAlign(AlignType)
@@ -107,9 +102,9 @@
 	void unsetAlign();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getAlign <em>Align</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getAlign <em>Align</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Align</em>' attribute is set.
 	 * @see #unsetAlign()
 	 * @see #getAlign()
@@ -119,151 +114,134 @@
 	boolean isSetAlign();
 
 	/**
-	 * Returns the value of the '<em><b>Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Char</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Char</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Char</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Char</em>' attribute.
 	 * @see #setChar(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTbodyType_Char()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Character"
-	 *        extendedMetaData="kind='attribute' name='char'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Character" extendedMetaData="kind='attribute' name='char'"
 	 * @generated
 	 */
 	String getChar();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getChar <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Char</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Char</em>' attribute.
 	 * @see #getChar()
 	 * @generated
 	 */
 	void setChar(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Charoff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Charoff</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Charoff</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Charoff</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Charoff</em>' attribute.
 	 * @see #setCharoff(Object)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTbodyType_Charoff()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length"
-	 *        extendedMetaData="kind='attribute' name='charoff'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length" extendedMetaData="kind='attribute' name='charoff'"
 	 * @generated
 	 */
 	Object getCharoff();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getCharoff <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Charoff</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getCharoff <em>Charoff</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Charoff</em>' attribute.
 	 * @see #getCharoff()
 	 * @generated
 	 */
 	void setCharoff(Object value);
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTbodyType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTbodyType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTbodyType_Lang()
@@ -275,35 +253,27 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -318,9 +288,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -331,8 +302,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -341,9 +312,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -353,85 +324,85 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTbodyType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTbodyType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
 	void setTitle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Valign</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.ValignType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Valign</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.ValignType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Valign</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Valign</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Valign</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see #isSetValign()
 	 * @see #unsetValign()
 	 * @see #setValign(ValignType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTbodyType_Valign()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='valign'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='valign'"
 	 * @generated
 	 */
 	ValignType getValign();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getValign <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Valign</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Valign</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see #isSetValign()
 	 * @see #unsetValign()
@@ -441,9 +412,9 @@
 	void setValign(ValignType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getValign <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getValign <em>Valign</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetValign()
 	 * @see #getValign()
 	 * @see #setValign(ValignType)
@@ -452,9 +423,9 @@
 	void unsetValign();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getValign <em>Valign</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType#getValign <em>Valign</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Valign</em>' attribute is set.
 	 * @see #unsetValign()
 	 * @see #getValign()
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTdType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTdType.java
index bf323f2..de38f32 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTdType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTdType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,100 +12,93 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import java.math.BigInteger;
-
 import java.util.List;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Td Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Td Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH1 <em>H1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH2 <em>H2</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH3 <em>H3</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH4 <em>H4</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH5 <em>H5</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH6 <em>H6</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getUl <em>Ul</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getOl <em>Ol</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDl <em>Dl</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getPre <em>Pre</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getBlockquote <em>Blockquote</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getHr <em>Hr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAbbr1 <em>Abbr1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAlign <em>Align</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAxis <em>Axis</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getChar <em>Char</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getCharoff <em>Charoff</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getColspan <em>Colspan</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getHeaders <em>Headers</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getRowspan <em>Rowspan</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getScope <em>Scope</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getValign <em>Valign</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH1 <em>H1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH2 <em>H2</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH3 <em>H3</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH4 <em>H4</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH5 <em>H5</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getH6 <em>H6</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getUl <em>Ul</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getOl <em>Ol</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDl <em>Dl</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getPre <em>Pre</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getBlockquote <em>Blockquote</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAddress <em>Address</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getHr <em>Hr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAbbr1 <em>Abbr1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAlign <em>Align</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAxis <em>Axis</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getChar <em>Char</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getCharoff <em>Charoff</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getColspan <em>Colspan</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getHeaders <em>Headers</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getRowspan <em>Rowspan</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getScope <em>Scope</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getValign <em>Valign</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType()
  * @model extendedMetaData="name='td' kind='mixed'"
  * @generated
  */
 public interface XhtmlTdType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -115,31 +108,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Flow Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Flow Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Flow Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Flow Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Flow Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_XhtmlFlowMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlFlowMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlFlowMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlFlowMix();
 
 	/**
-	 * Returns the value of the '<em><b>H1</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H1</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H1</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H1</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H1</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_H1()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -149,14 +142,14 @@
 	EList<XhtmlH1Type> getH1();
 
 	/**
-	 * Returns the value of the '<em><b>H2</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H2</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H2</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H2</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H2</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_H2()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -166,14 +159,14 @@
 	EList<XhtmlH2Type> getH2();
 
 	/**
-	 * Returns the value of the '<em><b>H3</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H3</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H3</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H3</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H3</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_H3()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -183,14 +176,14 @@
 	EList<XhtmlH3Type> getH3();
 
 	/**
-	 * Returns the value of the '<em><b>H4</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H4</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H4</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H4</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H4</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_H4()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -200,14 +193,14 @@
 	EList<XhtmlH4Type> getH4();
 
 	/**
-	 * Returns the value of the '<em><b>H5</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H5</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H5</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H5</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H5</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_H5()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -217,14 +210,14 @@
 	EList<XhtmlH5Type> getH5();
 
 	/**
-	 * Returns the value of the '<em><b>H6</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H6</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H6</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H6</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H6</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_H6()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -234,14 +227,14 @@
 	EList<XhtmlH6Type> getH6();
 
 	/**
-	 * Returns the value of the '<em><b>Ul</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ul</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ul</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ul</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ul</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Ul()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -251,14 +244,14 @@
 	EList<XhtmlUlType> getUl();
 
 	/**
-	 * Returns the value of the '<em><b>Ol</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ol</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ol</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ol</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ol</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Ol()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -268,14 +261,14 @@
 	EList<XhtmlOlType> getOl();
 
 	/**
-	 * Returns the value of the '<em><b>Dl</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dl</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dl</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dl</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dl</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Dl()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -285,14 +278,14 @@
 	EList<XhtmlDlType> getDl();
 
 	/**
-	 * Returns the value of the '<em><b>P</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>P</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>P</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>P</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>P</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_P()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -302,14 +295,14 @@
 	EList<XhtmlPType> getP();
 
 	/**
-	 * Returns the value of the '<em><b>Div</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Div</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Div</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Div</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Div</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Div()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -319,14 +312,14 @@
 	EList<XhtmlDivType> getDiv();
 
 	/**
-	 * Returns the value of the '<em><b>Pre</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Pre</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Pre</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Pre</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Pre</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Pre()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -336,14 +329,14 @@
 	EList<XhtmlPreType> getPre();
 
 	/**
-	 * Returns the value of the '<em><b>Blockquote</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Blockquote</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Blockquote</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Blockquote</em>' containment reference list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Blockquote</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Blockquote()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -353,14 +346,14 @@
 	EList<XhtmlBlockquoteType> getBlockquote();
 
 	/**
-	 * Returns the value of the '<em><b>Address</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Address</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Address</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Address</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Address</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Address()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -370,14 +363,14 @@
 	EList<XhtmlAddressType> getAddress();
 
 	/**
-	 * Returns the value of the '<em><b>Hr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Hr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -387,14 +380,14 @@
 	EList<XhtmlHrType> getHr();
 
 	/**
-	 * Returns the value of the '<em><b>Table</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Table</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Table</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Table()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -404,14 +397,14 @@
 	EList<XhtmlTableType> getTable();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -421,14 +414,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -438,14 +431,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -455,14 +448,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -472,14 +465,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -489,14 +482,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -506,14 +499,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -523,14 +516,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -540,14 +533,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -557,14 +550,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -574,14 +567,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -591,14 +584,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -608,14 +601,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -625,14 +618,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -642,14 +635,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -659,14 +652,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -676,14 +669,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -693,14 +686,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -710,14 +703,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -727,14 +720,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -744,14 +737,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -761,14 +754,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -778,14 +771,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -795,14 +788,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -812,58 +805,58 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr1</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr1</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr1</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr1</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr1</em>' attribute.
 	 * @see #setAbbr1(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Abbr1()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Text"
-	 *        extendedMetaData="kind='attribute' name='abbr'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Text" extendedMetaData="kind='attribute' name='abbr'"
 	 * @generated
 	 */
 	String getAbbr1();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAbbr1 <em>Abbr1</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Abbr1</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAbbr1 <em>Abbr1</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Abbr1</em>' attribute.
 	 * @see #getAbbr1()
 	 * @generated
 	 */
 	void setAbbr1(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Align</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.AlignType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Align</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.AlignType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Align</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Align</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Align</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see #isSetAlign()
 	 * @see #unsetAlign()
 	 * @see #setAlign(AlignType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Align()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='align'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='align'"
 	 * @generated
 	 */
 	AlignType getAlign();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAlign <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Align</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAlign <em>Align</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Align</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see #isSetAlign()
 	 * @see #unsetAlign()
@@ -874,8 +867,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAlign <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetAlign()
 	 * @see #getAlign()
 	 * @see #setAlign(AlignType)
@@ -884,9 +877,9 @@
 	void unsetAlign();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAlign <em>Align</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAlign <em>Align</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Align</em>' attribute is set.
 	 * @see #unsetAlign()
 	 * @see #getAlign()
@@ -896,122 +889,120 @@
 	boolean isSetAlign();
 
 	/**
-	 * Returns the value of the '<em><b>Axis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Axis</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Axis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Axis</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Axis</em>' attribute.
 	 * @see #setAxis(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Axis()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='axis'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='axis'"
 	 * @generated
 	 */
 	String getAxis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAxis <em>Axis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Axis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getAxis <em>Axis</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Axis</em>' attribute.
 	 * @see #getAxis()
 	 * @generated
 	 */
 	void setAxis(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Char</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Char</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Char</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Char</em>' attribute.
 	 * @see #setChar(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Char()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Character"
-	 *        extendedMetaData="kind='attribute' name='char'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Character" extendedMetaData="kind='attribute' name='char'"
 	 * @generated
 	 */
 	String getChar();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getChar <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Char</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getChar <em>Char</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Char</em>' attribute.
 	 * @see #getChar()
 	 * @generated
 	 */
 	void setChar(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Charoff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Charoff</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Charoff</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Charoff</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Charoff</em>' attribute.
 	 * @see #setCharoff(Object)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Charoff()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length"
-	 *        extendedMetaData="kind='attribute' name='charoff'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length" extendedMetaData="kind='attribute' name='charoff'"
 	 * @generated
 	 */
 	Object getCharoff();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getCharoff <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Charoff</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Charoff</em>' attribute.
 	 * @see #getCharoff()
 	 * @generated
 	 */
 	void setCharoff(Object value);
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Colspan</b></em>' attribute.
-	 * The default value is <code>"1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Colspan</b></em>' attribute. The default value is <code>"1"</code>. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Colspan</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Colspan</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Colspan</em>' attribute.
 	 * @see #isSetColspan()
 	 * @see #unsetColspan()
@@ -1025,9 +1016,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getColspan <em>Colspan</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Colspan</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Colspan</em>' attribute.
 	 * @see #isSetColspan()
 	 * @see #unsetColspan()
 	 * @see #getColspan()
@@ -1036,9 +1028,9 @@
 	void setColspan(BigInteger value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getColspan <em>Colspan</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getColspan <em>Colspan</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetColspan()
 	 * @see #getColspan()
 	 * @see #setColspan(BigInteger)
@@ -1047,9 +1039,9 @@
 	void unsetColspan();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getColspan <em>Colspan</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getColspan <em>Colspan</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Colspan</em>' attribute is set.
 	 * @see #unsetColspan()
 	 * @see #getColspan()
@@ -1059,13 +1051,13 @@
 	boolean isSetColspan();
 
 	/**
-	 * Returns the value of the '<em><b>Headers</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Headers</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Headers</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Headers</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Headers</em>' attribute.
 	 * @see #setHeaders(List)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Headers()
@@ -1077,79 +1069,64 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getHeaders <em>Headers</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Headers</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Headers</em>' attribute.
 	 * @see #getHeaders()
 	 * @generated
 	 */
 	void setHeaders(List<String> value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Lang()
@@ -1160,24 +1137,25 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Rowspan</b></em>' attribute.
-	 * The default value is <code>"1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Rowspan</b></em>' attribute. The default value is <code>"1"</code>. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Rowspan</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Rowspan</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Rowspan</em>' attribute.
 	 * @see #isSetRowspan()
 	 * @see #unsetRowspan()
@@ -1191,9 +1169,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getRowspan <em>Rowspan</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rowspan</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Rowspan</em>' attribute.
 	 * @see #isSetRowspan()
 	 * @see #unsetRowspan()
 	 * @see #getRowspan()
@@ -1202,9 +1181,9 @@
 	void setRowspan(BigInteger value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getRowspan <em>Rowspan</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getRowspan <em>Rowspan</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetRowspan()
 	 * @see #getRowspan()
 	 * @see #setRowspan(BigInteger)
@@ -1213,9 +1192,9 @@
 	void unsetRowspan();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getRowspan <em>Rowspan</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getRowspan <em>Rowspan</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Rowspan</em>' attribute is set.
 	 * @see #unsetRowspan()
 	 * @see #getRowspan()
@@ -1225,31 +1204,31 @@
 	boolean isSetRowspan();
 
 	/**
-	 * Returns the value of the '<em><b>Scope</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.ScopeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Scope</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.ScopeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Scope</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Scope</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Scope</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ScopeType
 	 * @see #isSetScope()
 	 * @see #unsetScope()
 	 * @see #setScope(ScopeType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Scope()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='scope'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='scope'"
 	 * @generated
 	 */
 	ScopeType getScope();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getScope <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Scope</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getScope <em>Scope</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Scope</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ScopeType
 	 * @see #isSetScope()
 	 * @see #unsetScope()
@@ -1260,8 +1239,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getScope <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetScope()
 	 * @see #getScope()
 	 * @see #setScope(ScopeType)
@@ -1270,9 +1249,9 @@
 	void unsetScope();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getScope <em>Scope</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getScope <em>Scope</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Scope</em>' attribute is set.
 	 * @see #unsetScope()
 	 * @see #getScope()
@@ -1282,26 +1261,17 @@
 	boolean isSetScope();
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -1315,10 +1285,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -1329,8 +1300,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -1339,9 +1310,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -1351,85 +1322,85 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
 	void setTitle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Valign</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.ValignType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Valign</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.ValignType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Valign</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Valign</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Valign</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see #isSetValign()
 	 * @see #unsetValign()
 	 * @see #setValign(ValignType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTdType_Valign()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='valign'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='valign'"
 	 * @generated
 	 */
 	ValignType getValign();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getValign <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Valign</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Valign</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see #isSetValign()
 	 * @see #unsetValign()
@@ -1440,8 +1411,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getValign <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetValign()
 	 * @see #getValign()
 	 * @see #setValign(ValignType)
@@ -1450,9 +1421,9 @@
 	void unsetValign();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getValign <em>Valign</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType#getValign <em>Valign</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Valign</em>' attribute is set.
 	 * @see #unsetValign()
 	 * @see #getValign()
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTfootType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTfootType.java
index e54d77c..7a55020 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTfootType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTfootType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,47 +12,42 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tfoot Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Tfoot Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getTr <em>Tr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getAlign <em>Align</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getChar <em>Char</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getCharoff <em>Charoff</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getValign <em>Valign</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getTr <em>Tr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getAlign <em>Align</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getChar <em>Char</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getCharoff <em>Charoff</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getValign <em>Valign</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTfootType()
  * @model extendedMetaData="name='tfoot' kind='elementOnly'"
  * @generated
  */
 public interface XhtmlTfootType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Tr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTfootType_Tr()
 	 * @model containment="true" required="true"
@@ -62,31 +57,31 @@
 	EList<XhtmlTrType> getTr();
 
 	/**
-	 * Returns the value of the '<em><b>Align</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.AlignType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Align</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.AlignType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Align</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Align</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Align</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see #isSetAlign()
 	 * @see #unsetAlign()
 	 * @see #setAlign(AlignType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTfootType_Align()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='align'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='align'"
 	 * @generated
 	 */
 	AlignType getAlign();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getAlign <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Align</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Align</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see #isSetAlign()
 	 * @see #unsetAlign()
@@ -97,8 +92,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getAlign <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetAlign()
 	 * @see #getAlign()
 	 * @see #setAlign(AlignType)
@@ -107,9 +102,9 @@
 	void unsetAlign();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getAlign <em>Align</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getAlign <em>Align</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Align</em>' attribute is set.
 	 * @see #unsetAlign()
 	 * @see #getAlign()
@@ -119,151 +114,134 @@
 	boolean isSetAlign();
 
 	/**
-	 * Returns the value of the '<em><b>Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Char</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Char</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Char</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Char</em>' attribute.
 	 * @see #setChar(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTfootType_Char()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Character"
-	 *        extendedMetaData="kind='attribute' name='char'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Character" extendedMetaData="kind='attribute' name='char'"
 	 * @generated
 	 */
 	String getChar();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getChar <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Char</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Char</em>' attribute.
 	 * @see #getChar()
 	 * @generated
 	 */
 	void setChar(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Charoff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Charoff</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Charoff</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Charoff</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Charoff</em>' attribute.
 	 * @see #setCharoff(Object)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTfootType_Charoff()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length"
-	 *        extendedMetaData="kind='attribute' name='charoff'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length" extendedMetaData="kind='attribute' name='charoff'"
 	 * @generated
 	 */
 	Object getCharoff();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getCharoff <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Charoff</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getCharoff <em>Charoff</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Charoff</em>' attribute.
 	 * @see #getCharoff()
 	 * @generated
 	 */
 	void setCharoff(Object value);
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTfootType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTfootType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTfootType_Lang()
@@ -275,35 +253,27 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -318,9 +288,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -331,8 +302,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -341,9 +312,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -353,85 +324,85 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTfootType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTfootType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
 	void setTitle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Valign</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.ValignType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Valign</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.ValignType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Valign</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Valign</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Valign</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see #isSetValign()
 	 * @see #unsetValign()
 	 * @see #setValign(ValignType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTfootType_Valign()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='valign'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='valign'"
 	 * @generated
 	 */
 	ValignType getValign();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getValign <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Valign</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Valign</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see #isSetValign()
 	 * @see #unsetValign()
@@ -441,9 +412,9 @@
 	void setValign(ValignType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getValign <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getValign <em>Valign</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetValign()
 	 * @see #getValign()
 	 * @see #setValign(ValignType)
@@ -452,9 +423,9 @@
 	void unsetValign();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getValign <em>Valign</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType#getValign <em>Valign</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Valign</em>' attribute is set.
 	 * @see #unsetValign()
 	 * @see #getValign()
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlThType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlThType.java
index efc841a..6feb183 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlThType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlThType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,100 +12,93 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import java.math.BigInteger;
-
 import java.util.List;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Th Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Th Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH1 <em>H1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH2 <em>H2</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH3 <em>H3</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH4 <em>H4</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH5 <em>H5</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH6 <em>H6</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getUl <em>Ul</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getOl <em>Ol</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDl <em>Dl</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getPre <em>Pre</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getBlockquote <em>Blockquote</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getHr <em>Hr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAbbr1 <em>Abbr1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAlign <em>Align</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAxis <em>Axis</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getChar <em>Char</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getCharoff <em>Charoff</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getColspan <em>Colspan</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getHeaders <em>Headers</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getRowspan <em>Rowspan</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getScope <em>Scope</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getValign <em>Valign</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH1 <em>H1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH2 <em>H2</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH3 <em>H3</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH4 <em>H4</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH5 <em>H5</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getH6 <em>H6</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getUl <em>Ul</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getOl <em>Ol</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDl <em>Dl</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getPre <em>Pre</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getBlockquote <em>Blockquote</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAddress <em>Address</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getHr <em>Hr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAbbr1 <em>Abbr1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAlign <em>Align</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAxis <em>Axis</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getChar <em>Char</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getCharoff <em>Charoff</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getColspan <em>Colspan</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getHeaders <em>Headers</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getRowspan <em>Rowspan</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getScope <em>Scope</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getValign <em>Valign</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType()
  * @model extendedMetaData="name='th' kind='mixed'"
  * @generated
  */
 public interface XhtmlThType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -115,31 +108,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Flow Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Flow Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Flow Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Flow Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Flow Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_XhtmlFlowMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlFlowMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlFlowMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlFlowMix();
 
 	/**
-	 * Returns the value of the '<em><b>H1</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H1</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H1</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H1</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H1</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_H1()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -149,14 +142,14 @@
 	EList<XhtmlH1Type> getH1();
 
 	/**
-	 * Returns the value of the '<em><b>H2</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H2</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H2</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H2</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H2</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_H2()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -166,14 +159,14 @@
 	EList<XhtmlH2Type> getH2();
 
 	/**
-	 * Returns the value of the '<em><b>H3</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H3</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H3</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H3</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H3</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_H3()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -183,14 +176,14 @@
 	EList<XhtmlH3Type> getH3();
 
 	/**
-	 * Returns the value of the '<em><b>H4</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H4</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H4</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H4</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H4</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_H4()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -200,14 +193,14 @@
 	EList<XhtmlH4Type> getH4();
 
 	/**
-	 * Returns the value of the '<em><b>H5</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H5</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H5</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H5</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H5</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_H5()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -217,14 +210,14 @@
 	EList<XhtmlH5Type> getH5();
 
 	/**
-	 * Returns the value of the '<em><b>H6</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>H6</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>H6</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>H6</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>H6</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_H6()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -234,14 +227,14 @@
 	EList<XhtmlH6Type> getH6();
 
 	/**
-	 * Returns the value of the '<em><b>Ul</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ul</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ul</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ul</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ul</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Ul()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -251,14 +244,14 @@
 	EList<XhtmlUlType> getUl();
 
 	/**
-	 * Returns the value of the '<em><b>Ol</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ol</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ol</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ol</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ol</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Ol()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -268,14 +261,14 @@
 	EList<XhtmlOlType> getOl();
 
 	/**
-	 * Returns the value of the '<em><b>Dl</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dl</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dl</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dl</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dl</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Dl()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -285,14 +278,14 @@
 	EList<XhtmlDlType> getDl();
 
 	/**
-	 * Returns the value of the '<em><b>P</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>P</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>P</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>P</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>P</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_P()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -302,14 +295,14 @@
 	EList<XhtmlPType> getP();
 
 	/**
-	 * Returns the value of the '<em><b>Div</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Div</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Div</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Div</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Div</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Div()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -319,14 +312,14 @@
 	EList<XhtmlDivType> getDiv();
 
 	/**
-	 * Returns the value of the '<em><b>Pre</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Pre</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Pre</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Pre</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Pre</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Pre()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -336,14 +329,14 @@
 	EList<XhtmlPreType> getPre();
 
 	/**
-	 * Returns the value of the '<em><b>Blockquote</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Blockquote</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Blockquote</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Blockquote</em>' containment reference list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Blockquote</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Blockquote()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -353,14 +346,14 @@
 	EList<XhtmlBlockquoteType> getBlockquote();
 
 	/**
-	 * Returns the value of the '<em><b>Address</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Address</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Address</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Address</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Address</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Address()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -370,14 +363,14 @@
 	EList<XhtmlAddressType> getAddress();
 
 	/**
-	 * Returns the value of the '<em><b>Hr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Hr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -387,14 +380,14 @@
 	EList<XhtmlHrType> getHr();
 
 	/**
-	 * Returns the value of the '<em><b>Table</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Table</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Table</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Table()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -404,14 +397,14 @@
 	EList<XhtmlTableType> getTable();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -421,14 +414,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -438,14 +431,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -455,14 +448,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -472,14 +465,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -489,14 +482,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -506,14 +499,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -523,14 +516,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -540,14 +533,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -557,14 +550,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -574,14 +567,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -591,14 +584,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -608,14 +601,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -625,14 +618,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -642,14 +635,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -659,14 +652,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -676,14 +669,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -693,14 +686,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -710,14 +703,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -727,14 +720,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -744,14 +737,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -761,14 +754,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -778,14 +771,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -795,14 +788,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -812,58 +805,58 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr1</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr1</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr1</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr1</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr1</em>' attribute.
 	 * @see #setAbbr1(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Abbr1()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Text"
-	 *        extendedMetaData="kind='attribute' name='abbr'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Text" extendedMetaData="kind='attribute' name='abbr'"
 	 * @generated
 	 */
 	String getAbbr1();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAbbr1 <em>Abbr1</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Abbr1</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAbbr1 <em>Abbr1</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Abbr1</em>' attribute.
 	 * @see #getAbbr1()
 	 * @generated
 	 */
 	void setAbbr1(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Align</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.AlignType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Align</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.AlignType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Align</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Align</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Align</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see #isSetAlign()
 	 * @see #unsetAlign()
 	 * @see #setAlign(AlignType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Align()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='align'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='align'"
 	 * @generated
 	 */
 	AlignType getAlign();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAlign <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Align</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAlign <em>Align</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Align</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see #isSetAlign()
 	 * @see #unsetAlign()
@@ -874,8 +867,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAlign <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetAlign()
 	 * @see #getAlign()
 	 * @see #setAlign(AlignType)
@@ -884,9 +877,9 @@
 	void unsetAlign();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAlign <em>Align</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAlign <em>Align</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Align</em>' attribute is set.
 	 * @see #unsetAlign()
 	 * @see #getAlign()
@@ -896,122 +889,120 @@
 	boolean isSetAlign();
 
 	/**
-	 * Returns the value of the '<em><b>Axis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Axis</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Axis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Axis</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Axis</em>' attribute.
 	 * @see #setAxis(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Axis()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='axis'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='axis'"
 	 * @generated
 	 */
 	String getAxis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAxis <em>Axis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Axis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getAxis <em>Axis</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Axis</em>' attribute.
 	 * @see #getAxis()
 	 * @generated
 	 */
 	void setAxis(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Char</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Char</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Char</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Char</em>' attribute.
 	 * @see #setChar(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Char()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Character"
-	 *        extendedMetaData="kind='attribute' name='char'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Character" extendedMetaData="kind='attribute' name='char'"
 	 * @generated
 	 */
 	String getChar();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getChar <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Char</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getChar <em>Char</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Char</em>' attribute.
 	 * @see #getChar()
 	 * @generated
 	 */
 	void setChar(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Charoff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Charoff</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Charoff</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Charoff</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Charoff</em>' attribute.
 	 * @see #setCharoff(Object)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Charoff()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length"
-	 *        extendedMetaData="kind='attribute' name='charoff'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length" extendedMetaData="kind='attribute' name='charoff'"
 	 * @generated
 	 */
 	Object getCharoff();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getCharoff <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Charoff</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Charoff</em>' attribute.
 	 * @see #getCharoff()
 	 * @generated
 	 */
 	void setCharoff(Object value);
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Colspan</b></em>' attribute.
-	 * The default value is <code>"1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Colspan</b></em>' attribute. The default value is <code>"1"</code>. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Colspan</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Colspan</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Colspan</em>' attribute.
 	 * @see #isSetColspan()
 	 * @see #unsetColspan()
@@ -1025,9 +1016,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getColspan <em>Colspan</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Colspan</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Colspan</em>' attribute.
 	 * @see #isSetColspan()
 	 * @see #unsetColspan()
 	 * @see #getColspan()
@@ -1036,9 +1028,9 @@
 	void setColspan(BigInteger value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getColspan <em>Colspan</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getColspan <em>Colspan</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetColspan()
 	 * @see #getColspan()
 	 * @see #setColspan(BigInteger)
@@ -1047,9 +1039,9 @@
 	void unsetColspan();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getColspan <em>Colspan</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getColspan <em>Colspan</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Colspan</em>' attribute is set.
 	 * @see #unsetColspan()
 	 * @see #getColspan()
@@ -1059,13 +1051,13 @@
 	boolean isSetColspan();
 
 	/**
-	 * Returns the value of the '<em><b>Headers</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Headers</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Headers</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Headers</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Headers</em>' attribute.
 	 * @see #setHeaders(List)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Headers()
@@ -1077,79 +1069,64 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getHeaders <em>Headers</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Headers</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Headers</em>' attribute.
 	 * @see #getHeaders()
 	 * @generated
 	 */
 	void setHeaders(List<String> value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Lang()
@@ -1160,24 +1137,25 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Rowspan</b></em>' attribute.
-	 * The default value is <code>"1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Rowspan</b></em>' attribute. The default value is <code>"1"</code>. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Rowspan</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Rowspan</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Rowspan</em>' attribute.
 	 * @see #isSetRowspan()
 	 * @see #unsetRowspan()
@@ -1191,9 +1169,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getRowspan <em>Rowspan</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rowspan</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Rowspan</em>' attribute.
 	 * @see #isSetRowspan()
 	 * @see #unsetRowspan()
 	 * @see #getRowspan()
@@ -1202,9 +1181,9 @@
 	void setRowspan(BigInteger value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getRowspan <em>Rowspan</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getRowspan <em>Rowspan</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetRowspan()
 	 * @see #getRowspan()
 	 * @see #setRowspan(BigInteger)
@@ -1213,9 +1192,9 @@
 	void unsetRowspan();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getRowspan <em>Rowspan</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getRowspan <em>Rowspan</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Rowspan</em>' attribute is set.
 	 * @see #unsetRowspan()
 	 * @see #getRowspan()
@@ -1225,31 +1204,31 @@
 	boolean isSetRowspan();
 
 	/**
-	 * Returns the value of the '<em><b>Scope</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.ScopeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Scope</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.ScopeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Scope</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Scope</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Scope</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ScopeType
 	 * @see #isSetScope()
 	 * @see #unsetScope()
 	 * @see #setScope(ScopeType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Scope()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='scope'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='scope'"
 	 * @generated
 	 */
 	ScopeType getScope();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getScope <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Scope</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getScope <em>Scope</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Scope</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ScopeType
 	 * @see #isSetScope()
 	 * @see #unsetScope()
@@ -1260,8 +1239,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getScope <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetScope()
 	 * @see #getScope()
 	 * @see #setScope(ScopeType)
@@ -1270,9 +1249,9 @@
 	void unsetScope();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getScope <em>Scope</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getScope <em>Scope</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Scope</em>' attribute is set.
 	 * @see #unsetScope()
 	 * @see #getScope()
@@ -1282,26 +1261,17 @@
 	boolean isSetScope();
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -1315,10 +1285,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -1329,8 +1300,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -1339,9 +1310,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -1351,85 +1322,85 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
 	void setTitle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Valign</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.ValignType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Valign</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.ValignType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Valign</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Valign</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Valign</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see #isSetValign()
 	 * @see #unsetValign()
 	 * @see #setValign(ValignType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlThType_Valign()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='valign'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='valign'"
 	 * @generated
 	 */
 	ValignType getValign();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getValign <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Valign</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Valign</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see #isSetValign()
 	 * @see #unsetValign()
@@ -1440,8 +1411,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getValign <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetValign()
 	 * @see #getValign()
 	 * @see #setValign(ValignType)
@@ -1450,9 +1421,9 @@
 	void unsetValign();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getValign <em>Valign</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType#getValign <em>Valign</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Valign</em>' attribute is set.
 	 * @see #unsetValign()
 	 * @see #getValign()
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTheadType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTheadType.java
index 67fb090..1de01eb 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTheadType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTheadType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,47 +12,42 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Thead Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Thead Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getTr <em>Tr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getAlign <em>Align</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getChar <em>Char</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getCharoff <em>Charoff</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getValign <em>Valign</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getTr <em>Tr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getAlign <em>Align</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getChar <em>Char</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getCharoff <em>Charoff</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getValign <em>Valign</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTheadType()
  * @model extendedMetaData="name='thead' kind='elementOnly'"
  * @generated
  */
 public interface XhtmlTheadType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Tr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTheadType_Tr()
 	 * @model containment="true" required="true"
@@ -62,31 +57,31 @@
 	EList<XhtmlTrType> getTr();
 
 	/**
-	 * Returns the value of the '<em><b>Align</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.AlignType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Align</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.AlignType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Align</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Align</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Align</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see #isSetAlign()
 	 * @see #unsetAlign()
 	 * @see #setAlign(AlignType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTheadType_Align()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='align'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='align'"
 	 * @generated
 	 */
 	AlignType getAlign();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getAlign <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Align</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Align</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see #isSetAlign()
 	 * @see #unsetAlign()
@@ -97,8 +92,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getAlign <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetAlign()
 	 * @see #getAlign()
 	 * @see #setAlign(AlignType)
@@ -107,9 +102,9 @@
 	void unsetAlign();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getAlign <em>Align</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getAlign <em>Align</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Align</em>' attribute is set.
 	 * @see #unsetAlign()
 	 * @see #getAlign()
@@ -119,151 +114,134 @@
 	boolean isSetAlign();
 
 	/**
-	 * Returns the value of the '<em><b>Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Char</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Char</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Char</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Char</em>' attribute.
 	 * @see #setChar(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTheadType_Char()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Character"
-	 *        extendedMetaData="kind='attribute' name='char'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Character" extendedMetaData="kind='attribute' name='char'"
 	 * @generated
 	 */
 	String getChar();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getChar <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Char</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Char</em>' attribute.
 	 * @see #getChar()
 	 * @generated
 	 */
 	void setChar(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Charoff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Charoff</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Charoff</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Charoff</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Charoff</em>' attribute.
 	 * @see #setCharoff(Object)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTheadType_Charoff()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length"
-	 *        extendedMetaData="kind='attribute' name='charoff'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length" extendedMetaData="kind='attribute' name='charoff'"
 	 * @generated
 	 */
 	Object getCharoff();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getCharoff <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Charoff</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getCharoff <em>Charoff</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Charoff</em>' attribute.
 	 * @see #getCharoff()
 	 * @generated
 	 */
 	void setCharoff(Object value);
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTheadType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTheadType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTheadType_Lang()
@@ -275,35 +253,27 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -318,9 +288,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -331,8 +302,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -341,9 +312,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -353,85 +324,85 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTheadType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTheadType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
 	void setTitle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Valign</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.ValignType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Valign</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.ValignType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Valign</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Valign</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Valign</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see #isSetValign()
 	 * @see #unsetValign()
 	 * @see #setValign(ValignType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTheadType_Valign()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='valign'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='valign'"
 	 * @generated
 	 */
 	ValignType getValign();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getValign <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Valign</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Valign</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see #isSetValign()
 	 * @see #unsetValign()
@@ -441,9 +412,9 @@
 	void setValign(ValignType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getValign <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getValign <em>Valign</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetValign()
 	 * @see #getValign()
 	 * @see #setValign(ValignType)
@@ -452,9 +423,9 @@
 	void unsetValign();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getValign <em>Valign</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType#getValign <em>Valign</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Valign</em>' attribute is set.
 	 * @see #unsetValign()
 	 * @see #getValign()
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTrType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTrType.java
index d3b2957..714ac20 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTrType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlTrType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,51 +12,45 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tr Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Tr Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTh <em>Th</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTd <em>Td</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getAlign <em>Align</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getChar <em>Char</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getCharoff <em>Charoff</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getValign <em>Valign</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getGroup <em>Group</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTh <em>Th</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTd <em>Td</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getAlign <em>Align</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getChar <em>Char</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getCharoff <em>Charoff</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getValign <em>Valign</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTrType()
  * @model extendedMetaData="name='tr' kind='elementOnly'"
  * @generated
  */
 public interface XhtmlTrType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Group</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Group</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Group</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Group</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Group</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTrType_Group()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -66,14 +60,14 @@
 	FeatureMap getGroup();
 
 	/**
-	 * Returns the value of the '<em><b>Th</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Th</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Th</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Th</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Th</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTrType_Th()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -83,14 +77,14 @@
 	EList<XhtmlThType> getTh();
 
 	/**
-	 * Returns the value of the '<em><b>Td</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Td</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Td</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Td</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Td</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTrType_Td()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -100,31 +94,31 @@
 	EList<XhtmlTdType> getTd();
 
 	/**
-	 * Returns the value of the '<em><b>Align</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.AlignType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Align</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.AlignType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Align</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Align</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Align</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see #isSetAlign()
 	 * @see #unsetAlign()
 	 * @see #setAlign(AlignType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTrType_Align()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='align'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='align'"
 	 * @generated
 	 */
 	AlignType getAlign();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getAlign <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Align</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getAlign <em>Align</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Align</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.AlignType
 	 * @see #isSetAlign()
 	 * @see #unsetAlign()
@@ -135,8 +129,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getAlign <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetAlign()
 	 * @see #getAlign()
 	 * @see #setAlign(AlignType)
@@ -145,9 +139,9 @@
 	void unsetAlign();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getAlign <em>Align</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getAlign <em>Align</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Align</em>' attribute is set.
 	 * @see #unsetAlign()
 	 * @see #getAlign()
@@ -157,151 +151,134 @@
 	boolean isSetAlign();
 
 	/**
-	 * Returns the value of the '<em><b>Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Char</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Char</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Char</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Char</em>' attribute.
 	 * @see #setChar(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTrType_Char()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Character"
-	 *        extendedMetaData="kind='attribute' name='char'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Character" extendedMetaData="kind='attribute' name='char'"
 	 * @generated
 	 */
 	String getChar();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getChar <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Char</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getChar <em>Char</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Char</em>' attribute.
 	 * @see #getChar()
 	 * @generated
 	 */
 	void setChar(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Charoff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Charoff</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Charoff</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Charoff</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Charoff</em>' attribute.
 	 * @see #setCharoff(Object)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTrType_Charoff()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length"
-	 *        extendedMetaData="kind='attribute' name='charoff'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.Length" extendedMetaData="kind='attribute' name='charoff'"
 	 * @generated
 	 */
 	Object getCharoff();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getCharoff <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Charoff</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Charoff</em>' attribute.
 	 * @see #getCharoff()
 	 * @generated
 	 */
 	void setCharoff(Object value);
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTrType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTrType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTrType_Lang()
@@ -312,36 +289,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -355,10 +324,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -369,8 +339,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -379,9 +349,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -391,85 +361,85 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTrType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTrType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
 	void setTitle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Valign</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.xhtml.ValignType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Valign</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.rmf.reqif10.xhtml.ValignType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Valign</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Valign</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Valign</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see #isSetValign()
 	 * @see #unsetValign()
 	 * @see #setValign(ValignType)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlTrType_Valign()
-	 * @model unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='valign'"
+	 * @model unsettable="true" extendedMetaData="kind='attribute' name='valign'"
 	 * @generated
 	 */
 	ValignType getValign();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getValign <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Valign</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Valign</em>' attribute.
 	 * @see org.eclipse.rmf.reqif10.xhtml.ValignType
 	 * @see #isSetValign()
 	 * @see #unsetValign()
@@ -480,8 +450,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getValign <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetValign()
 	 * @see #getValign()
 	 * @see #setValign(ValignType)
@@ -490,9 +460,9 @@
 	void unsetValign();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getValign <em>Valign</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType#getValign <em>Valign</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Valign</em>' attribute is set.
 	 * @see #unsetValign()
 	 * @see #getValign()
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlUlType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlUlType.java
index 6fa4016..24f2623 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlUlType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlUlType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,43 +12,38 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Ul Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Ul Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getLi <em>Li</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getLi <em>Li</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlUlType()
  * @model extendedMetaData="name='ul' kind='elementOnly'"
  * @generated
  */
 public interface XhtmlUlType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Li</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Li</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Li</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Li</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Li</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlUlType_Li()
 	 * @model containment="true" required="true"
@@ -58,97 +53,81 @@
 	EList<XhtmlLiType> getLi();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlUlType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlUlType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlUlType_Lang()
@@ -159,36 +138,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -202,10 +173,11 @@
 	SpaceType getSpace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getSpace <em>Space</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -216,8 +188,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -226,9 +198,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -238,54 +210,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlUlType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getStyle <em>Style</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlUlType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlVarType.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlVarType.java
index 73050d0..ff857c5 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlVarType.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/XhtmlVarType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,70 +12,64 @@
 package org.eclipse.rmf.reqif10.xhtml;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.FeatureMap;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Var Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Var Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType()
  * @model extendedMetaData="name='var' kind='mixed'"
  * @generated
  */
 public interface XhtmlVarType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mixed</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Mixed()
 	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -85,31 +79,31 @@
 	FeatureMap getMixed();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Inline Mix</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Inline Mix</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Inline Mix</em>' attribute list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_XhtmlInlineMix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true"
+	 *        volatile="true" derived="true" extendedMetaData="kind='group' name='XhtmlInlineMix:1'"
 	 * @generated
 	 */
 	FeatureMap getXhtmlInlineMix();
 
 	/**
-	 * Returns the value of the '<em><b>Br</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Br</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Br</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Br</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Br()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -119,14 +113,14 @@
 	EList<XhtmlBrType> getBr();
 
 	/**
-	 * Returns the value of the '<em><b>Span</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Span</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Span</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Span</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Span()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -136,14 +130,14 @@
 	EList<XhtmlSpanType> getSpan();
 
 	/**
-	 * Returns the value of the '<em><b>Em</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Em</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Em</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Em</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Em()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -153,14 +147,14 @@
 	EList<XhtmlEmType> getEm();
 
 	/**
-	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strong</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Strong</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strong</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Strong()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -170,14 +164,14 @@
 	EList<XhtmlStrongType> getStrong();
 
 	/**
-	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dfn</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dfn</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dfn</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Dfn()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -187,14 +181,14 @@
 	EList<XhtmlDfnType> getDfn();
 
 	/**
-	 * Returns the value of the '<em><b>Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Code</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Code</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Code</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Code()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -204,14 +198,14 @@
 	EList<XhtmlCodeType> getCode();
 
 	/**
-	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Samp</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Samp</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Samp</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Samp()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -221,14 +215,14 @@
 	EList<XhtmlSampType> getSamp();
 
 	/**
-	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Kbd</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kbd</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kbd</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Kbd()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -238,14 +232,14 @@
 	EList<XhtmlKbdType> getKbd();
 
 	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Var</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Var</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Var</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Var()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -255,14 +249,14 @@
 	EList<XhtmlVarType> getVar();
 
 	/**
-	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Cite</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Cite</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Cite</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Cite()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -272,14 +266,14 @@
 	EList<XhtmlCiteType> getCite();
 
 	/**
-	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Abbr</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abbr</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abbr</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Abbr()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -289,14 +283,14 @@
 	EList<XhtmlAbbrType> getAbbr();
 
 	/**
-	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Acronym</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Acronym</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Acronym</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Acronym()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -306,14 +300,14 @@
 	EList<XhtmlAcronymType> getAcronym();
 
 	/**
-	 * Returns the value of the '<em><b>Q</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Q</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Q</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Q</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Q()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -323,14 +317,14 @@
 	EList<XhtmlQType> getQ();
 
 	/**
-	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tt</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tt</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tt</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Tt()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -340,14 +334,14 @@
 	EList<XhtmlInlPresType> getTt();
 
 	/**
-	 * Returns the value of the '<em><b>I</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>I</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>I</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>I</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>I</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_I()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -357,14 +351,14 @@
 	EList<XhtmlInlPresType> getI();
 
 	/**
-	 * Returns the value of the '<em><b>B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>B</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>B</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>B</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>B</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_B()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -374,14 +368,14 @@
 	EList<XhtmlInlPresType> getB();
 
 	/**
-	 * Returns the value of the '<em><b>Big</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Big</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Big</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Big</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Big()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -391,14 +385,14 @@
 	EList<XhtmlInlPresType> getBig();
 
 	/**
-	 * Returns the value of the '<em><b>Small</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Small</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Small</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Small</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Small()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -408,14 +402,14 @@
 	EList<XhtmlInlPresType> getSmall();
 
 	/**
-	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sub</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sub</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sub</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Sub()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -425,14 +419,14 @@
 	EList<XhtmlInlPresType> getSub();
 
 	/**
-	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sup</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Sup</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sup</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Sup()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -442,14 +436,14 @@
 	EList<XhtmlInlPresType> getSup();
 
 	/**
-	 * Returns the value of the '<em><b>A</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>A</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>A</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>A</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>A</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_A()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -459,14 +453,14 @@
 	EList<XhtmlAType> getA();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Object()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -476,14 +470,14 @@
 	EList<XhtmlObjectType> getObject();
 
 	/**
-	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ins</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ins</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ins</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Ins()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -493,14 +487,14 @@
 	EList<XhtmlEditType> getIns();
 
 	/**
-	 * Returns the value of the '<em><b>Del</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Del</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Del</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Del</em>' containment reference list.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Del()
 	 * @model containment="true" transient="true" volatile="true" derived="true"
@@ -510,97 +504,81 @@
 	EList<XhtmlEditType> getDel();
 
 	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='class'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='class'"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Id()
-	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
-	 *        extendedMetaData="kind='attribute' name='id'"
+	 * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID" extendedMetaData="kind='attribute' name='id'"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getId <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+	 * begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>lang (as an attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a language code for the natural language of the content of any element; its
+	 * value is inherited. This name is reserved by virtue of its definition in the XML specification.
+	 * </p>
+	 * </div> <div xmlns="http://www.w3.org/1999/xhtml"> <h4>Notes</h4>
+	 * <p>
+	 * Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never
+	 * going to be a realistic possibility.
+	 * </p>
+	 * <p>
+	 * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> and the IANA language subtag registry at <a
+	 * href="http://www.iana.org/assignments/language-subtag-registry">
+	 * http://www.iana.org/assignments/language-subtag-registry</a> for further information.
+	 * </p>
+	 * <p>
+	 * The union allows for the 'un-declaration' of xml:lang with the empty string.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>lang (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose value
-	 *        is a language code for the natural language of the content of
-	 *        any element; its value is inherited.  This name is reserved
-	 *        by virtue of its definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      <h4>Notes</h4>
-	 *      <p>
-	 *       Attempting to install the relevant ISO 2- and 3-letter
-	 *       codes as the enumerated possible values is probably never
-	 *       going to be a realistic possibility.  
-	 *      </p>
-	 *      <p>
-	 *       See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-	 *        http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-	 *       and the IANA language subtag registry at
-	 *       <a href="http://www.iana.org/assignments/language-subtag-registry">
-	 *        http://www.iana.org/assignments/language-subtag-registry</a>
-	 *       for further information.
-	 *      </p>
-	 *      <p>
-	 *       The union allows for the 'un-declaration' of xml:lang with
-	 *       the empty string.
-	 *      </p>
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #setLang(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Lang()
@@ -611,36 +589,28 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #getLang()
 	 * @generated
 	 */
 	void setLang(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Space</b></em>' attribute.
-	 * The default value is <code>"preserve"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
+	 * Returns the value of the '<em><b>Space</b></em>' attribute. The default value is <code>"preserve"</code>. The
+	 * literals are from the enumeration {@link org.eclipse.emf.ecore.xml.namespace.SpaceType}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc --> <!-- begin-model-doc --> <div xmlns="http://www.w3.org/1999/xhtml"> <h3>space (as an
+	 * attribute name)</h3>
+	 * <p>
+	 * denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for
+	 * the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML
+	 * specification.
+	 * </p>
+	 * </div> <!-- end-model-doc -->
 	 * 
-	 *     <div xmlns="http://www.w3.org/1999/xhtml">
-	 *      
-	 *       <h3>space (as an attribute name)</h3>
-	 *       <p>
-	 *        denotes an attribute whose
-	 *        value is a keyword indicating what whitespace processing
-	 *        discipline is intended for the content of the element; its
-	 *        value is inherited.  This name is reserved by virtue of its
-	 *        definition in the XML specification.</p>
-	 *      
-	 *     </div>
-	 *    
-	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
@@ -655,9 +625,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Space</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Space</em>' attribute.
 	 * @see org.eclipse.emf.ecore.xml.namespace.SpaceType
 	 * @see #isSetSpace()
 	 * @see #unsetSpace()
@@ -668,8 +639,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSpace <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpace()
 	 * @see #getSpace()
 	 * @see #setSpace(SpaceType)
@@ -678,9 +649,9 @@
 	void unsetSpace();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSpace <em>Space</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getSpace <em>Space</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Space</em>' attribute is set.
 	 * @see #unsetSpace()
 	 * @see #getSpace()
@@ -690,54 +661,54 @@
 	boolean isSetSpace();
 
 	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Style</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Style</em>' attribute.
 	 * @see #setStyle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Style()
-	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA"
-	 *        extendedMetaData="kind='attribute' name='style'"
+	 * @model dataType="org.eclipse.rmf.reqif10.datatypes.CDATA" extendedMetaData="kind='attribute' name='style'"
 	 * @generated
 	 */
 	String getStyle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Style</em>' attribute.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#getXhtmlVarType_Title()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" extendedMetaData="kind='attribute' name='title'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #getTitle()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/DocumentRootImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/DocumentRootImpl.java
index 063b11a..03c6433 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/DocumentRootImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/DocumentRootImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,53 +13,46 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EMap;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
 import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.EcoreEMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.rmf.reqif10.xhtml.DocumentRoot;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlDivType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Document Root</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Document Root</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.DocumentRootImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class DocumentRootImpl extends EObjectImpl implements DocumentRoot {
+public class DocumentRootImpl extends MinimalEObjectImpl implements DocumentRoot {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -67,9 +60,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The cached value of the '{@link #getXMLNSPrefixMap() <em>XMLNS Prefix Map</em>}' map.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getXMLNSPrefixMap() <em>XMLNS Prefix Map</em>}' map. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getXMLNSPrefixMap()
 	 * @generated
 	 * @ordered
@@ -77,9 +70,9 @@
 	protected EMap<String, String> xMLNSPrefixMap;
 
 	/**
-	 * The cached value of the '{@link #getXSISchemaLocation() <em>XSI Schema Location</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getXSISchemaLocation() <em>XSI Schema Location</em>}' map. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getXSISchemaLocation()
 	 * @generated
 	 * @ordered
@@ -87,9 +80,9 @@
 	protected EMap<String, String> xSISchemaLocation;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -97,9 +90,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -107,9 +100,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -117,9 +109,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -127,9 +118,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -137,9 +128,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -147,8 +138,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DocumentRootImpl() {
@@ -156,8 +147,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -166,8 +157,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -178,86 +169,88 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EMap<String, String> getXMLNSPrefixMap() {
 		if (xMLNSPrefixMap == null) {
-			xMLNSPrefixMap = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, XhtmlPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
+			xMLNSPrefixMap = new EcoreEMap<String, String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class,
+					this, XhtmlPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
 		}
 		return xMLNSPrefixMap;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EMap<String, String> getXSISchemaLocation() {
 		if (xSISchemaLocation == null) {
-			xSISchemaLocation = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, XhtmlPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
+			xSISchemaLocation = new EcoreEMap<String, String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class,
+					this, XhtmlPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
 		}
 		return xSISchemaLocation;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlDivType getDiv() {
-		return (XhtmlDivType)getMixed().get(XhtmlPackage.eINSTANCE.getDocumentRoot_Div(), true);
+		return (XhtmlDivType) getMixed().get(XhtmlPackage.eINSTANCE.getDocumentRoot_Div(), true);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDiv(XhtmlDivType newDiv, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(XhtmlPackage.eINSTANCE.getDocumentRoot_Div(), newDiv, msgs);
+		return ((FeatureMap.Internal) getMixed()).basicAdd(XhtmlPackage.eINSTANCE.getDocumentRoot_Div(), newDiv, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDiv(XhtmlDivType newDiv) {
-		((FeatureMap.Internal)getMixed()).set(XhtmlPackage.eINSTANCE.getDocumentRoot_Div(), newDiv);
+		((FeatureMap.Internal) getMixed()).set(XhtmlPackage.eINSTANCE.getDocumentRoot_Div(), newDiv);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlPType getP() {
-		return (XhtmlPType)getMixed().get(XhtmlPackage.eINSTANCE.getDocumentRoot_P(), true);
+		return (XhtmlPType) getMixed().get(XhtmlPackage.eINSTANCE.getDocumentRoot_P(), true);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetP(XhtmlPType newP, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(XhtmlPackage.eINSTANCE.getDocumentRoot_P(), newP, msgs);
+		return ((FeatureMap.Internal) getMixed()).basicAdd(XhtmlPackage.eINSTANCE.getDocumentRoot_P(), newP, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setP(XhtmlPType newP) {
-		((FeatureMap.Internal)getMixed()).set(XhtmlPackage.eINSTANCE.getDocumentRoot_P(), newP);
+		((FeatureMap.Internal) getMixed()).set(XhtmlPackage.eINSTANCE.getDocumentRoot_P(), newP);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -265,8 +258,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -277,8 +270,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -286,8 +279,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -298,8 +291,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -307,8 +300,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -319,178 +312,184 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.DOCUMENT_ROOT__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				return ((InternalEList<?>)getXMLNSPrefixMap()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				return ((InternalEList<?>)getXSISchemaLocation()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.DOCUMENT_ROOT__DIV:
-				return basicSetDiv(null, msgs);
-			case XhtmlPackage.DOCUMENT_ROOT__P:
-				return basicSetP(null, msgs);
+		case XhtmlPackage.DOCUMENT_ROOT__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
+			return ((InternalEList<?>) getXMLNSPrefixMap()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
+			return ((InternalEList<?>) getXSISchemaLocation()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.DOCUMENT_ROOT__DIV:
+			return basicSetDiv(null, msgs);
+		case XhtmlPackage.DOCUMENT_ROOT__P:
+			return basicSetP(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.DOCUMENT_ROOT__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				if (coreType) return getXMLNSPrefixMap();
-				else return getXMLNSPrefixMap().map();
-			case XhtmlPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				if (coreType) return getXSISchemaLocation();
-				else return getXSISchemaLocation().map();
-			case XhtmlPackage.DOCUMENT_ROOT__DIV:
-				return getDiv();
-			case XhtmlPackage.DOCUMENT_ROOT__P:
-				return getP();
-			case XhtmlPackage.DOCUMENT_ROOT__CLASS:
-				return getClass_();
-			case XhtmlPackage.DOCUMENT_ROOT__ID:
-				return getId();
-			case XhtmlPackage.DOCUMENT_ROOT__TITLE:
-				return getTitle();
+		case XhtmlPackage.DOCUMENT_ROOT__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
+			if (coreType)
+				return getXMLNSPrefixMap();
+			else
+				return getXMLNSPrefixMap().map();
+		case XhtmlPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
+			if (coreType)
+				return getXSISchemaLocation();
+			else
+				return getXSISchemaLocation().map();
+		case XhtmlPackage.DOCUMENT_ROOT__DIV:
+			return getDiv();
+		case XhtmlPackage.DOCUMENT_ROOT__P:
+			return getP();
+		case XhtmlPackage.DOCUMENT_ROOT__CLASS:
+			return getClass_();
+		case XhtmlPackage.DOCUMENT_ROOT__ID:
+			return getId();
+		case XhtmlPackage.DOCUMENT_ROOT__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.DOCUMENT_ROOT__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				((EStructuralFeature.Setting)getXMLNSPrefixMap()).set(newValue);
-				return;
-			case XhtmlPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				((EStructuralFeature.Setting)getXSISchemaLocation()).set(newValue);
-				return;
-			case XhtmlPackage.DOCUMENT_ROOT__DIV:
-				setDiv((XhtmlDivType)newValue);
-				return;
-			case XhtmlPackage.DOCUMENT_ROOT__P:
-				setP((XhtmlPType)newValue);
-				return;
-			case XhtmlPackage.DOCUMENT_ROOT__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.DOCUMENT_ROOT__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.DOCUMENT_ROOT__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.DOCUMENT_ROOT__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
+			((EStructuralFeature.Setting) getXMLNSPrefixMap()).set(newValue);
+			return;
+		case XhtmlPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
+			((EStructuralFeature.Setting) getXSISchemaLocation()).set(newValue);
+			return;
+		case XhtmlPackage.DOCUMENT_ROOT__DIV:
+			setDiv((XhtmlDivType) newValue);
+			return;
+		case XhtmlPackage.DOCUMENT_ROOT__P:
+			setP((XhtmlPType) newValue);
+			return;
+		case XhtmlPackage.DOCUMENT_ROOT__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.DOCUMENT_ROOT__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.DOCUMENT_ROOT__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.DOCUMENT_ROOT__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				getXMLNSPrefixMap().clear();
-				return;
-			case XhtmlPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				getXSISchemaLocation().clear();
-				return;
-			case XhtmlPackage.DOCUMENT_ROOT__DIV:
-				setDiv((XhtmlDivType)null);
-				return;
-			case XhtmlPackage.DOCUMENT_ROOT__P:
-				setP((XhtmlPType)null);
-				return;
-			case XhtmlPackage.DOCUMENT_ROOT__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.DOCUMENT_ROOT__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.DOCUMENT_ROOT__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.DOCUMENT_ROOT__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
+			getXMLNSPrefixMap().clear();
+			return;
+		case XhtmlPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
+			getXSISchemaLocation().clear();
+			return;
+		case XhtmlPackage.DOCUMENT_ROOT__DIV:
+			setDiv((XhtmlDivType) null);
+			return;
+		case XhtmlPackage.DOCUMENT_ROOT__P:
+			setP((XhtmlPType) null);
+			return;
+		case XhtmlPackage.DOCUMENT_ROOT__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.DOCUMENT_ROOT__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.DOCUMENT_ROOT__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.DOCUMENT_ROOT__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty();
-			case XhtmlPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				return xSISchemaLocation != null && !xSISchemaLocation.isEmpty();
-			case XhtmlPackage.DOCUMENT_ROOT__DIV:
-				return getDiv() != null;
-			case XhtmlPackage.DOCUMENT_ROOT__P:
-				return getP() != null;
-			case XhtmlPackage.DOCUMENT_ROOT__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.DOCUMENT_ROOT__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.DOCUMENT_ROOT__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.DOCUMENT_ROOT__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
+			return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty();
+		case XhtmlPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
+			return xSISchemaLocation != null && !xSISchemaLocation.isEmpty();
+		case XhtmlPackage.DOCUMENT_ROOT__DIV:
+			return getDiv() != null;
+		case XhtmlPackage.DOCUMENT_ROOT__P:
+			return getP() != null;
+		case XhtmlPackage.DOCUMENT_ROOT__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.DOCUMENT_ROOT__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.DOCUMENT_ROOT__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //DocumentRootImpl
+} // DocumentRootImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlATypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlATypeImpl.java
index 3f9f1f2..549dfed 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlATypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlATypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,27 +12,20 @@
 package org.eclipse.rmf.reqif10.xhtml.impl;
 
 import java.math.BigInteger;
-
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -53,61 +46,60 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>AType</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>AType</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getXhtmlInlNoAnchorMix <em>Xhtml Inl No Anchor Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getAccesskey <em>Accesskey</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getCharset <em>Charset</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getHref <em>Href</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getHreflang <em>Hreflang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getRel <em>Rel</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getRev <em>Rev</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getTabindex <em>Tabindex</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getXhtmlInlNoAnchorMix <em>Xhtml Inl No Anchor Mix</em>}
+ * </li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getAccesskey <em>Accesskey</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getCharset <em>Charset</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getHref <em>Href</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getHreflang <em>Hreflang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getRel <em>Rel</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getRev <em>Rev</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getTabindex <em>Tabindex</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlATypeImpl#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlATypeImpl extends EObjectImpl implements XhtmlAType {
+public class XhtmlATypeImpl extends MinimalEObjectImpl implements XhtmlAType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -115,9 +107,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getAccesskey() <em>Accesskey</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAccesskey() <em>Accesskey</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAccesskey()
 	 * @generated
 	 * @ordered
@@ -125,9 +117,9 @@
 	protected static final String ACCESSKEY_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getAccesskey() <em>Accesskey</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAccesskey() <em>Accesskey</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAccesskey()
 	 * @generated
 	 * @ordered
@@ -135,9 +127,9 @@
 	protected String accesskey = ACCESSKEY_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCharset() <em>Charset</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCharset() <em>Charset</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharset()
 	 * @generated
 	 * @ordered
@@ -145,9 +137,9 @@
 	protected static final String CHARSET_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCharset() <em>Charset</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCharset() <em>Charset</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharset()
 	 * @generated
 	 * @ordered
@@ -155,9 +147,9 @@
 	protected String charset = CHARSET_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -165,9 +157,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -175,9 +167,9 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getHref() <em>Href</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getHref() <em>Href</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getHref()
 	 * @generated
 	 * @ordered
@@ -185,9 +177,9 @@
 	protected static final String HREF_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getHref() <em>Href</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHref() <em>Href</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getHref()
 	 * @generated
 	 * @ordered
@@ -195,9 +187,9 @@
 	protected String href = HREF_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getHreflang() <em>Hreflang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getHreflang() <em>Hreflang</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getHreflang()
 	 * @generated
 	 * @ordered
@@ -205,9 +197,9 @@
 	protected static final String HREFLANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getHreflang() <em>Hreflang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHreflang() <em>Hreflang</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getHreflang()
 	 * @generated
 	 * @ordered
@@ -215,9 +207,8 @@
 	protected String hreflang = HREFLANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -225,9 +216,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -235,9 +225,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -245,9 +235,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -255,9 +245,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getRel() <em>Rel</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getRel() <em>Rel</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getRel()
 	 * @generated
 	 * @ordered
@@ -265,9 +255,8 @@
 	protected static final List<String> REL_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getRel() <em>Rel</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getRel() <em>Rel</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRel()
 	 * @generated
 	 * @ordered
@@ -275,9 +264,9 @@
 	protected List<String> rel = REL_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getRev() <em>Rev</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getRev() <em>Rev</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getRev()
 	 * @generated
 	 * @ordered
@@ -285,9 +274,8 @@
 	protected static final List<String> REV_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getRev() <em>Rev</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getRev() <em>Rev</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRev()
 	 * @generated
 	 * @ordered
@@ -295,9 +283,9 @@
 	protected List<String> rev = REV_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -305,9 +293,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -315,18 +303,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -334,9 +321,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -344,9 +331,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTabindex() <em>Tabindex</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTabindex() <em>Tabindex</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTabindex()
 	 * @generated
 	 * @ordered
@@ -354,9 +341,9 @@
 	protected static final BigInteger TABINDEX_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTabindex() <em>Tabindex</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTabindex() <em>Tabindex</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTabindex()
 	 * @generated
 	 * @ordered
@@ -364,9 +351,9 @@
 	protected BigInteger tabindex = TABINDEX_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -374,9 +361,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -384,9 +371,9 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -394,9 +381,9 @@
 	protected static final String TYPE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -404,8 +391,8 @@
 	protected String type = TYPE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlATypeImpl() {
@@ -413,8 +400,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -423,8 +410,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -435,17 +422,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlNoAnchorMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlAType_XhtmlInlNoAnchorMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlAType_XhtmlInlNoAnchorMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -453,8 +440,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -462,8 +449,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -471,8 +458,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -480,8 +467,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -489,8 +476,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -498,8 +485,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -507,8 +494,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -516,8 +503,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -525,8 +512,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -534,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -543,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -552,8 +539,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -561,8 +548,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -570,8 +557,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -579,8 +566,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -588,8 +575,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -597,8 +584,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -606,8 +593,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -615,8 +602,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -624,8 +611,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -633,8 +620,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -642,8 +629,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -651,8 +638,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getAccesskey() {
@@ -660,8 +647,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAccesskey(String newAccesskey) {
@@ -672,8 +659,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getCharset() {
@@ -681,8 +668,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCharset(String newCharset) {
@@ -693,8 +680,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -702,8 +689,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -714,8 +701,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getHref() {
@@ -723,8 +710,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHref(String newHref) {
@@ -735,8 +722,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getHreflang() {
@@ -744,8 +731,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHreflang(String newHreflang) {
@@ -756,8 +743,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -765,8 +752,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -777,8 +764,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -786,8 +773,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -798,8 +785,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public List<String> getRel() {
@@ -807,8 +794,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRel(List<String> newRel) {
@@ -819,8 +806,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public List<String> getRev() {
@@ -828,8 +815,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRev(List<String> newRev) {
@@ -840,8 +827,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -849,8 +836,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -863,8 +850,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -877,8 +864,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -886,8 +873,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -895,8 +882,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -907,8 +894,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger getTabindex() {
@@ -916,8 +903,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTabindex(BigInteger newTabindex) {
@@ -928,8 +915,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -937,8 +924,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -949,8 +936,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getType() {
@@ -958,8 +945,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(String newType) {
@@ -970,573 +957,579 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ATYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__XHTML_INL_NO_ANCHOR_MIX:
-				return ((InternalEList<?>)getXhtmlInlNoAnchorMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ATYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__XHTML_INL_NO_ANCHOR_MIX:
+			return ((InternalEList<?>) getXhtmlInlNoAnchorMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ATYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ATYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_ATYPE__XHTML_INL_NO_ANCHOR_MIX:
-				if (coreType) return getXhtmlInlNoAnchorMix();
-				return ((FeatureMap.Internal)getXhtmlInlNoAnchorMix()).getWrapper();
-			case XhtmlPackage.XHTML_ATYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_ATYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_ATYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_ATYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_ATYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_ATYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_ATYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_ATYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_ATYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_ATYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_ATYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_ATYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_ATYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_ATYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_ATYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_ATYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_ATYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_ATYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_ATYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_ATYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_ATYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_ATYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_ATYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_ATYPE__ACCESSKEY:
-				return getAccesskey();
-			case XhtmlPackage.XHTML_ATYPE__CHARSET:
-				return getCharset();
-			case XhtmlPackage.XHTML_ATYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_ATYPE__HREF:
-				return getHref();
-			case XhtmlPackage.XHTML_ATYPE__HREFLANG:
-				return getHreflang();
-			case XhtmlPackage.XHTML_ATYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_ATYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_ATYPE__REL:
-				return getRel();
-			case XhtmlPackage.XHTML_ATYPE__REV:
-				return getRev();
-			case XhtmlPackage.XHTML_ATYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_ATYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_ATYPE__TABINDEX:
-				return getTabindex();
-			case XhtmlPackage.XHTML_ATYPE__TITLE:
-				return getTitle();
-			case XhtmlPackage.XHTML_ATYPE__TYPE:
-				return getType();
+		case XhtmlPackage.XHTML_ATYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_ATYPE__XHTML_INL_NO_ANCHOR_MIX:
+			if (coreType)
+				return getXhtmlInlNoAnchorMix();
+			return ((FeatureMap.Internal) getXhtmlInlNoAnchorMix()).getWrapper();
+		case XhtmlPackage.XHTML_ATYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_ATYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_ATYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_ATYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_ATYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_ATYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_ATYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_ATYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_ATYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_ATYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_ATYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_ATYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_ATYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_ATYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_ATYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_ATYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_ATYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_ATYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_ATYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_ATYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_ATYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_ATYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_ATYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_ATYPE__ACCESSKEY:
+			return getAccesskey();
+		case XhtmlPackage.XHTML_ATYPE__CHARSET:
+			return getCharset();
+		case XhtmlPackage.XHTML_ATYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_ATYPE__HREF:
+			return getHref();
+		case XhtmlPackage.XHTML_ATYPE__HREFLANG:
+			return getHreflang();
+		case XhtmlPackage.XHTML_ATYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_ATYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_ATYPE__REL:
+			return getRel();
+		case XhtmlPackage.XHTML_ATYPE__REV:
+			return getRev();
+		case XhtmlPackage.XHTML_ATYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_ATYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_ATYPE__TABINDEX:
+			return getTabindex();
+		case XhtmlPackage.XHTML_ATYPE__TITLE:
+			return getTitle();
+		case XhtmlPackage.XHTML_ATYPE__TYPE:
+			return getType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ATYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__XHTML_INL_NO_ANCHOR_MIX:
-				((FeatureMap.Internal)getXhtmlInlNoAnchorMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__ACCESSKEY:
-				setAccesskey((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__CHARSET:
-				setCharset((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__HREF:
-				setHref((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__HREFLANG:
-				setHreflang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__REL:
-				setRel((List<String>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__REV:
-				setRev((List<String>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__TABINDEX:
-				setTabindex((BigInteger)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__TITLE:
-				setTitle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__TYPE:
-				setType((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_ATYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__XHTML_INL_NO_ANCHOR_MIX:
+			((FeatureMap.Internal) getXhtmlInlNoAnchorMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__ACCESSKEY:
+			setAccesskey((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__CHARSET:
+			setCharset((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__HREF:
+			setHref((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__HREFLANG:
+			setHreflang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__REL:
+			setRel((List<String>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__REV:
+			setRev((List<String>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__TABINDEX:
+			setTabindex((BigInteger) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__TITLE:
+			setTitle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__TYPE:
+			setType((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ATYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__XHTML_INL_NO_ANCHOR_MIX:
-				getXhtmlInlNoAnchorMix().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__ACCESSKEY:
-				setAccesskey(ACCESSKEY_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__CHARSET:
-				setCharset(CHARSET_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__HREF:
-				setHref(HREF_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__HREFLANG:
-				setHreflang(HREFLANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__REL:
-				setRel(REL_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__REV:
-				setRev(REV_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_ATYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__TABINDEX:
-				setTabindex(TABINDEX_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ATYPE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_ATYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__XHTML_INL_NO_ANCHOR_MIX:
+			getXhtmlInlNoAnchorMix().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__ACCESSKEY:
+			setAccesskey(ACCESSKEY_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__CHARSET:
+			setCharset(CHARSET_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__HREF:
+			setHref(HREF_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__HREFLANG:
+			setHreflang(HREFLANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__REL:
+			setRel(REL_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__REV:
+			setRev(REV_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_ATYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__TABINDEX:
+			setTabindex(TABINDEX_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ATYPE__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ATYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__XHTML_INL_NO_ANCHOR_MIX:
-				return !getXhtmlInlNoAnchorMix().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_ATYPE__ACCESSKEY:
-				return ACCESSKEY_EDEFAULT == null ? accesskey != null : !ACCESSKEY_EDEFAULT.equals(accesskey);
-			case XhtmlPackage.XHTML_ATYPE__CHARSET:
-				return CHARSET_EDEFAULT == null ? charset != null : !CHARSET_EDEFAULT.equals(charset);
-			case XhtmlPackage.XHTML_ATYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_ATYPE__HREF:
-				return HREF_EDEFAULT == null ? href != null : !HREF_EDEFAULT.equals(href);
-			case XhtmlPackage.XHTML_ATYPE__HREFLANG:
-				return HREFLANG_EDEFAULT == null ? hreflang != null : !HREFLANG_EDEFAULT.equals(hreflang);
-			case XhtmlPackage.XHTML_ATYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_ATYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_ATYPE__REL:
-				return REL_EDEFAULT == null ? rel != null : !REL_EDEFAULT.equals(rel);
-			case XhtmlPackage.XHTML_ATYPE__REV:
-				return REV_EDEFAULT == null ? rev != null : !REV_EDEFAULT.equals(rev);
-			case XhtmlPackage.XHTML_ATYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_ATYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_ATYPE__TABINDEX:
-				return TABINDEX_EDEFAULT == null ? tabindex != null : !TABINDEX_EDEFAULT.equals(tabindex);
-			case XhtmlPackage.XHTML_ATYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-			case XhtmlPackage.XHTML_ATYPE__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case XhtmlPackage.XHTML_ATYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__XHTML_INL_NO_ANCHOR_MIX:
+			return !getXhtmlInlNoAnchorMix().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_ATYPE__ACCESSKEY:
+			return ACCESSKEY_EDEFAULT == null ? accesskey != null : !ACCESSKEY_EDEFAULT.equals(accesskey);
+		case XhtmlPackage.XHTML_ATYPE__CHARSET:
+			return CHARSET_EDEFAULT == null ? charset != null : !CHARSET_EDEFAULT.equals(charset);
+		case XhtmlPackage.XHTML_ATYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_ATYPE__HREF:
+			return HREF_EDEFAULT == null ? href != null : !HREF_EDEFAULT.equals(href);
+		case XhtmlPackage.XHTML_ATYPE__HREFLANG:
+			return HREFLANG_EDEFAULT == null ? hreflang != null : !HREFLANG_EDEFAULT.equals(hreflang);
+		case XhtmlPackage.XHTML_ATYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_ATYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_ATYPE__REL:
+			return REL_EDEFAULT == null ? rel != null : !REL_EDEFAULT.equals(rel);
+		case XhtmlPackage.XHTML_ATYPE__REV:
+			return REV_EDEFAULT == null ? rev != null : !REV_EDEFAULT.equals(rev);
+		case XhtmlPackage.XHTML_ATYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_ATYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_ATYPE__TABINDEX:
+			return TABINDEX_EDEFAULT == null ? tabindex != null : !TABINDEX_EDEFAULT.equals(tabindex);
+		case XhtmlPackage.XHTML_ATYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_ATYPE__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", accesskey: ");
+		result.append(", accesskey: "); //$NON-NLS-1$
 		result.append(accesskey);
-		result.append(", charset: ");
+		result.append(", charset: "); //$NON-NLS-1$
 		result.append(charset);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", href: ");
+		result.append(", href: "); //$NON-NLS-1$
 		result.append(href);
-		result.append(", hreflang: ");
+		result.append(", hreflang: "); //$NON-NLS-1$
 		result.append(hreflang);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", rel: ");
+		result.append(", rel: "); //$NON-NLS-1$
 		result.append(rel);
-		result.append(", rev: ");
+		result.append(", rev: "); //$NON-NLS-1$
 		result.append(rev);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", tabindex: ");
+		result.append(", tabindex: "); //$NON-NLS-1$
 		result.append(tabindex);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
-		result.append(", type: ");
+		result.append(", type: "); //$NON-NLS-1$
 		result.append(type);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlATypeImpl
+} // XhtmlATypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlAbbrTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlAbbrTypeImpl.java
index 70dd709..660e2a9 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlAbbrTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlAbbrTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -50,54 +44,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abbr Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Abbr Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAbbrTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlAbbrTypeImpl extends EObjectImpl implements XhtmlAbbrType {
+public class XhtmlAbbrTypeImpl extends MinimalEObjectImpl implements XhtmlAbbrType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -105,9 +97,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -115,9 +107,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -125,9 +117,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -135,9 +126,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -145,9 +135,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -155,9 +145,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -165,9 +155,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -175,9 +165,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -185,18 +175,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -204,9 +193,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -214,9 +203,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -224,9 +213,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -234,8 +223,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlAbbrTypeImpl() {
@@ -243,8 +232,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -253,8 +242,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -265,17 +254,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlAbbrType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -283,8 +272,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -292,8 +281,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -301,8 +290,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -310,8 +299,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -319,8 +308,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -328,8 +317,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -337,8 +326,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -346,8 +335,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -355,8 +344,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -364,8 +353,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -373,8 +362,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -382,8 +371,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -391,8 +380,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -400,8 +389,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -409,8 +398,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -418,8 +407,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -427,8 +416,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -436,8 +425,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -445,8 +434,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -454,8 +443,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -463,8 +452,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -472,8 +461,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -481,8 +470,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -490,8 +479,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -499,8 +488,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -511,8 +500,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -520,8 +509,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -532,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -541,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -553,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -562,8 +551,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -576,8 +565,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -590,8 +579,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -599,8 +588,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -608,8 +597,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -620,8 +609,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -629,8 +618,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -641,490 +630,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ABBR_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ABBR_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ABBR_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ABBR_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_ABBR_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_ABBR_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_ABBR_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_ABBR_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_ABBR_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_ABBR_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_ABBR_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_ABBR_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_ABBR_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_ABBR_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_ABBR_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_ABBR_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_ABBR_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_ABBR_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_ABBR_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_ABBR_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_ABBR_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_ABBR_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_ABBR_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_ABBR_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_ABBR_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_ABBR_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_ABBR_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_ABBR_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_ABBR_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_ABBR_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_ABBR_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_ABBR_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_ABBR_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_ABBR_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_ABBR_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_ABBR_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_ABBR_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_ABBR_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_ABBR_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_ABBR_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_ABBR_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_ABBR_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_ABBR_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_ABBR_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_ABBR_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_ABBR_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_ABBR_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_ABBR_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_ABBR_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_ABBR_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_ABBR_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_ABBR_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_ABBR_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_ABBR_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_ABBR_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_ABBR_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_ABBR_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_ABBR_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_ABBR_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_ABBR_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_ABBR_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_ABBR_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_ABBR_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_ABBR_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_ABBR_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_ABBR_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_ABBR_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ABBR_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ABBR_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ABBR_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ABBR_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ABBR_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_ABBR_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_ABBR_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_ABBR_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_ABBR_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_ABBR_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_ABBR_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_ABBR_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_ABBR_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_ABBR_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_ABBR_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_ABBR_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_ABBR_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_ABBR_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlAbbrTypeImpl
+} // XhtmlAbbrTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlAcronymTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlAcronymTypeImpl.java
index d95f7fb..716692f 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlAcronymTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlAcronymTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -50,54 +44,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Acronym Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Acronym Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAcronymTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlAcronymTypeImpl extends EObjectImpl implements XhtmlAcronymType {
+public class XhtmlAcronymTypeImpl extends MinimalEObjectImpl implements XhtmlAcronymType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -105,9 +97,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -115,9 +107,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -125,9 +117,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -135,9 +126,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -145,9 +135,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -155,9 +145,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -165,9 +155,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -175,9 +165,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -185,18 +175,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -204,9 +193,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -214,9 +203,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -224,9 +213,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -234,8 +223,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlAcronymTypeImpl() {
@@ -243,8 +232,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -253,8 +242,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -265,17 +254,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlAcronymType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -283,8 +272,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -292,8 +281,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -301,8 +290,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -310,8 +299,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -319,8 +308,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -328,8 +317,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -337,8 +326,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -346,8 +335,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -355,8 +344,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -364,8 +353,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -373,8 +362,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -382,8 +371,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -391,8 +380,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -400,8 +389,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -409,8 +398,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -418,8 +407,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -427,8 +416,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -436,8 +425,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -445,8 +434,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -454,8 +443,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -463,8 +452,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -472,8 +461,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -481,8 +470,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -490,8 +479,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -499,8 +488,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -511,8 +500,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -520,8 +509,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -532,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -541,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -553,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -562,8 +551,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -576,8 +565,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -590,8 +579,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -599,8 +588,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -608,8 +597,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -620,8 +609,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -629,8 +618,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -641,490 +630,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_ACRONYM_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_ACRONYM_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlAcronymTypeImpl
+} // XhtmlAcronymTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlAddressTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlAddressTypeImpl.java
index 20f9227..6f4199a 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlAddressTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlAddressTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -51,54 +45,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Address Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Address Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlAddressTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlAddressTypeImpl extends EObjectImpl implements XhtmlAddressType {
+public class XhtmlAddressTypeImpl extends MinimalEObjectImpl implements XhtmlAddressType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -106,9 +98,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -116,9 +108,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -126,9 +118,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -136,9 +127,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -146,9 +136,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -156,9 +146,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -166,9 +156,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -176,9 +166,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -186,18 +176,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -205,9 +194,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -215,9 +204,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -225,9 +214,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -235,8 +224,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlAddressTypeImpl() {
@@ -244,8 +233,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -254,8 +243,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -266,17 +255,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlAddressType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlAddressType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -284,8 +273,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -293,8 +282,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -302,8 +291,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -311,8 +300,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -320,8 +309,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -329,8 +318,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -338,8 +327,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -347,8 +336,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -356,8 +345,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -365,8 +354,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -374,8 +363,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -383,8 +372,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -392,8 +381,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -401,8 +390,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -410,8 +399,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -419,8 +408,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -428,8 +417,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -437,8 +426,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -446,8 +435,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -455,8 +444,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -464,8 +453,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -473,8 +462,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -482,8 +471,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -491,8 +480,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -500,8 +489,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -512,8 +501,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -521,8 +510,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -533,8 +522,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -542,8 +531,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -554,8 +543,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -563,8 +552,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -577,8 +566,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -591,8 +580,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -600,8 +589,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -609,8 +598,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -621,8 +610,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -630,8 +619,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -642,490 +631,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_ADDRESS_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_ADDRESS_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlAddressTypeImpl
+} // XhtmlAddressTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlBlockquoteTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlBlockquoteTypeImpl.java
index 8d3de0c..af448da 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlBlockquoteTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlBlockquoteTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlDivType;
@@ -50,48 +44,47 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlUlType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Blockquote Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Blockquote Type</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getXhtmlBlockMix <em>Xhtml Block Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getH1 <em>H1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getH2 <em>H2</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getH3 <em>H3</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getH4 <em>H4</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getH5 <em>H5</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getH6 <em>H6</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getUl <em>Ul</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getOl <em>Ol</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getDl <em>Dl</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getPre <em>Pre</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getBlockquote <em>Blockquote</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getHr <em>Hr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getXhtmlBlockMix <em>Xhtml Block Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getH1 <em>H1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getH2 <em>H2</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getH3 <em>H3</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getH4 <em>H4</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getH5 <em>H5</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getH6 <em>H6</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getUl <em>Ul</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getOl <em>Ol</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getDl <em>Dl</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getPre <em>Pre</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getBlockquote <em>Blockquote</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getAddress <em>Address</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getHr <em>Hr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBlockquoteTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlBlockquoteTypeImpl extends EObjectImpl implements XhtmlBlockquoteType {
+public class XhtmlBlockquoteTypeImpl extends MinimalEObjectImpl implements XhtmlBlockquoteType {
 	/**
-	 * The cached value of the '{@link #getXhtmlBlockMix() <em>Xhtml Block Mix</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getXhtmlBlockMix() <em>Xhtml Block Mix</em>}' attribute list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getXhtmlBlockMix()
 	 * @generated
 	 * @ordered
@@ -99,9 +92,9 @@
 	protected FeatureMap xhtmlBlockMix;
 
 	/**
-	 * The default value of the '{@link #getCite() <em>Cite</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCite() <em>Cite</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getCite()
 	 * @generated
 	 * @ordered
@@ -109,9 +102,9 @@
 	protected static final String CITE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCite() <em>Cite</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCite() <em>Cite</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getCite()
 	 * @generated
 	 * @ordered
@@ -119,9 +112,9 @@
 	protected String cite = CITE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -129,9 +122,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -139,9 +132,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -149,9 +141,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -159,9 +150,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -169,9 +160,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -179,9 +170,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -189,9 +180,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -199,18 +190,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -218,9 +208,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -228,9 +218,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -238,9 +228,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -248,8 +238,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlBlockquoteTypeImpl() {
@@ -257,8 +247,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -267,8 +257,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlBlockMix() {
@@ -279,8 +269,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH1Type> getH1() {
@@ -288,8 +278,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH2Type> getH2() {
@@ -297,8 +287,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH3Type> getH3() {
@@ -306,8 +296,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH4Type> getH4() {
@@ -315,8 +305,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH5Type> getH5() {
@@ -324,8 +314,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH6Type> getH6() {
@@ -333,8 +323,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlUlType> getUl() {
@@ -342,8 +332,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlOlType> getOl() {
@@ -351,8 +341,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDlType> getDl() {
@@ -360,8 +350,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlPType> getP() {
@@ -369,8 +359,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDivType> getDiv() {
@@ -378,8 +368,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlPreType> getPre() {
@@ -387,8 +377,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBlockquoteType> getBlockquote() {
@@ -396,8 +386,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAddressType> getAddress() {
@@ -405,8 +395,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlHrType> getHr() {
@@ -414,8 +404,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlTableType> getTable() {
@@ -423,8 +413,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -432,8 +422,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -441,8 +431,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getCite() {
@@ -450,8 +440,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCite(String newCite) {
@@ -462,8 +452,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -471,8 +461,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -483,8 +473,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -492,8 +482,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -504,8 +494,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -513,8 +503,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -525,8 +515,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -534,8 +524,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -548,8 +538,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -562,8 +552,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -571,8 +561,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -580,8 +570,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -592,8 +582,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -601,8 +591,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -613,411 +603,416 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__XHTML_BLOCK_MIX:
-				return ((InternalEList<?>)getXhtmlBlockMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H1:
-				return ((InternalEList<?>)getH1()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H2:
-				return ((InternalEList<?>)getH2()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H3:
-				return ((InternalEList<?>)getH3()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H4:
-				return ((InternalEList<?>)getH4()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H5:
-				return ((InternalEList<?>)getH5()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H6:
-				return ((InternalEList<?>)getH6()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__UL:
-				return ((InternalEList<?>)getUl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__OL:
-				return ((InternalEList<?>)getOl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DL:
-				return ((InternalEList<?>)getDl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__P:
-				return ((InternalEList<?>)getP()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DIV:
-				return ((InternalEList<?>)getDiv()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__PRE:
-				return ((InternalEList<?>)getPre()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__BLOCKQUOTE:
-				return ((InternalEList<?>)getBlockquote()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ADDRESS:
-				return ((InternalEList<?>)getAddress()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__HR:
-				return ((InternalEList<?>)getHr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TABLE:
-				return ((InternalEList<?>)getTable()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__XHTML_BLOCK_MIX:
+			return ((InternalEList<?>) getXhtmlBlockMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H1:
+			return ((InternalEList<?>) getH1()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H2:
+			return ((InternalEList<?>) getH2()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H3:
+			return ((InternalEList<?>) getH3()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H4:
+			return ((InternalEList<?>) getH4()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H5:
+			return ((InternalEList<?>) getH5()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H6:
+			return ((InternalEList<?>) getH6()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__UL:
+			return ((InternalEList<?>) getUl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__OL:
+			return ((InternalEList<?>) getOl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DL:
+			return ((InternalEList<?>) getDl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__P:
+			return ((InternalEList<?>) getP()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DIV:
+			return ((InternalEList<?>) getDiv()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__PRE:
+			return ((InternalEList<?>) getPre()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__BLOCKQUOTE:
+			return ((InternalEList<?>) getBlockquote()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ADDRESS:
+			return ((InternalEList<?>) getAddress()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__HR:
+			return ((InternalEList<?>) getHr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TABLE:
+			return ((InternalEList<?>) getTable()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__XHTML_BLOCK_MIX:
-				if (coreType) return getXhtmlBlockMix();
-				return ((FeatureMap.Internal)getXhtmlBlockMix()).getWrapper();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H1:
-				return getH1();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H2:
-				return getH2();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H3:
-				return getH3();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H4:
-				return getH4();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H5:
-				return getH5();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H6:
-				return getH6();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__UL:
-				return getUl();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__OL:
-				return getOl();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DL:
-				return getDl();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__P:
-				return getP();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DIV:
-				return getDiv();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__PRE:
-				return getPre();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__BLOCKQUOTE:
-				return getBlockquote();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ADDRESS:
-				return getAddress();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__HR:
-				return getHr();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TABLE:
-				return getTable();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__XHTML_BLOCK_MIX:
+			if (coreType)
+				return getXhtmlBlockMix();
+			return ((FeatureMap.Internal) getXhtmlBlockMix()).getWrapper();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H1:
+			return getH1();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H2:
+			return getH2();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H3:
+			return getH3();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H4:
+			return getH4();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H5:
+			return getH5();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H6:
+			return getH6();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__UL:
+			return getUl();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__OL:
+			return getOl();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DL:
+			return getDl();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__P:
+			return getP();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DIV:
+			return getDiv();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__PRE:
+			return getPre();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__BLOCKQUOTE:
+			return getBlockquote();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ADDRESS:
+			return getAddress();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__HR:
+			return getHr();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TABLE:
+			return getTable();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__XHTML_BLOCK_MIX:
-				((FeatureMap.Internal)getXhtmlBlockMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H1:
-				getH1().clear();
-				getH1().addAll((Collection<? extends XhtmlH1Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H2:
-				getH2().clear();
-				getH2().addAll((Collection<? extends XhtmlH2Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H3:
-				getH3().clear();
-				getH3().addAll((Collection<? extends XhtmlH3Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H4:
-				getH4().clear();
-				getH4().addAll((Collection<? extends XhtmlH4Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H5:
-				getH5().clear();
-				getH5().addAll((Collection<? extends XhtmlH5Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H6:
-				getH6().clear();
-				getH6().addAll((Collection<? extends XhtmlH6Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__UL:
-				getUl().clear();
-				getUl().addAll((Collection<? extends XhtmlUlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__OL:
-				getOl().clear();
-				getOl().addAll((Collection<? extends XhtmlOlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DL:
-				getDl().clear();
-				getDl().addAll((Collection<? extends XhtmlDlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__P:
-				getP().clear();
-				getP().addAll((Collection<? extends XhtmlPType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DIV:
-				getDiv().clear();
-				getDiv().addAll((Collection<? extends XhtmlDivType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__PRE:
-				getPre().clear();
-				getPre().addAll((Collection<? extends XhtmlPreType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__BLOCKQUOTE:
-				getBlockquote().clear();
-				getBlockquote().addAll((Collection<? extends XhtmlBlockquoteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ADDRESS:
-				getAddress().clear();
-				getAddress().addAll((Collection<? extends XhtmlAddressType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__HR:
-				getHr().clear();
-				getHr().addAll((Collection<? extends XhtmlHrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TABLE:
-				getTable().clear();
-				getTable().addAll((Collection<? extends XhtmlTableType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CITE:
-				setCite((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__XHTML_BLOCK_MIX:
+			((FeatureMap.Internal) getXhtmlBlockMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H1:
+			getH1().clear();
+			getH1().addAll((Collection<? extends XhtmlH1Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H2:
+			getH2().clear();
+			getH2().addAll((Collection<? extends XhtmlH2Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H3:
+			getH3().clear();
+			getH3().addAll((Collection<? extends XhtmlH3Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H4:
+			getH4().clear();
+			getH4().addAll((Collection<? extends XhtmlH4Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H5:
+			getH5().clear();
+			getH5().addAll((Collection<? extends XhtmlH5Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H6:
+			getH6().clear();
+			getH6().addAll((Collection<? extends XhtmlH6Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__UL:
+			getUl().clear();
+			getUl().addAll((Collection<? extends XhtmlUlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__OL:
+			getOl().clear();
+			getOl().addAll((Collection<? extends XhtmlOlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DL:
+			getDl().clear();
+			getDl().addAll((Collection<? extends XhtmlDlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__P:
+			getP().clear();
+			getP().addAll((Collection<? extends XhtmlPType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DIV:
+			getDiv().clear();
+			getDiv().addAll((Collection<? extends XhtmlDivType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__PRE:
+			getPre().clear();
+			getPre().addAll((Collection<? extends XhtmlPreType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__BLOCKQUOTE:
+			getBlockquote().clear();
+			getBlockquote().addAll((Collection<? extends XhtmlBlockquoteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ADDRESS:
+			getAddress().clear();
+			getAddress().addAll((Collection<? extends XhtmlAddressType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__HR:
+			getHr().clear();
+			getHr().addAll((Collection<? extends XhtmlHrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TABLE:
+			getTable().clear();
+			getTable().addAll((Collection<? extends XhtmlTableType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CITE:
+			setCite((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__XHTML_BLOCK_MIX:
-				getXhtmlBlockMix().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H1:
-				getH1().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H2:
-				getH2().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H3:
-				getH3().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H4:
-				getH4().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H5:
-				getH5().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H6:
-				getH6().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__UL:
-				getUl().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__OL:
-				getOl().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DL:
-				getDl().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__P:
-				getP().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DIV:
-				getDiv().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__PRE:
-				getPre().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__BLOCKQUOTE:
-				getBlockquote().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ADDRESS:
-				getAddress().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__HR:
-				getHr().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TABLE:
-				getTable().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CITE:
-				setCite(CITE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__XHTML_BLOCK_MIX:
+			getXhtmlBlockMix().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H1:
+			getH1().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H2:
+			getH2().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H3:
+			getH3().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H4:
+			getH4().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H5:
+			getH5().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H6:
+			getH6().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__UL:
+			getUl().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__OL:
+			getOl().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DL:
+			getDl().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__P:
+			getP().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DIV:
+			getDiv().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__PRE:
+			getPre().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__BLOCKQUOTE:
+			getBlockquote().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ADDRESS:
+			getAddress().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__HR:
+			getHr().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TABLE:
+			getTable().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CITE:
+			setCite(CITE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__XHTML_BLOCK_MIX:
-				return xhtmlBlockMix != null && !xhtmlBlockMix.isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H1:
-				return !getH1().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H2:
-				return !getH2().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H3:
-				return !getH3().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H4:
-				return !getH4().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H5:
-				return !getH5().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H6:
-				return !getH6().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__UL:
-				return !getUl().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__OL:
-				return !getOl().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DL:
-				return !getDl().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__P:
-				return !getP().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DIV:
-				return !getDiv().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__PRE:
-				return !getPre().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__BLOCKQUOTE:
-				return !getBlockquote().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ADDRESS:
-				return !getAddress().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__HR:
-				return !getHr().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TABLE:
-				return !getTable().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CITE:
-				return CITE_EDEFAULT == null ? cite != null : !CITE_EDEFAULT.equals(cite);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__XHTML_BLOCK_MIX:
+			return xhtmlBlockMix != null && !xhtmlBlockMix.isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H1:
+			return !getH1().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H2:
+			return !getH2().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H3:
+			return !getH3().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H4:
+			return !getH4().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H5:
+			return !getH5().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__H6:
+			return !getH6().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__UL:
+			return !getUl().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__OL:
+			return !getOl().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DL:
+			return !getDl().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__P:
+			return !getP().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DIV:
+			return !getDiv().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__PRE:
+			return !getPre().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__BLOCKQUOTE:
+			return !getBlockquote().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ADDRESS:
+			return !getAddress().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__HR:
+			return !getHr().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TABLE:
+			return !getTable().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CITE:
+			return CITE_EDEFAULT == null ? cite != null : !CITE_EDEFAULT.equals(cite);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (xhtmlBlockMix: ");
+		result.append(" (xhtmlBlockMix: "); //$NON-NLS-1$
 		result.append(xhtmlBlockMix);
-		result.append(", cite: ");
+		result.append(", cite: "); //$NON-NLS-1$
 		result.append(cite);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlBlockquoteTypeImpl
+} // XhtmlBlockquoteTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlBrTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlBrTypeImpl.java
index 42c263d..c99a13c 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlBrTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlBrTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,38 +12,32 @@
 package org.eclipse.rmf.reqif10.xhtml.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlBrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Br Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Br Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBrTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBrTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBrTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBrTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBrTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBrTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBrTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlBrTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlBrTypeImpl extends EObjectImpl implements XhtmlBrType {
+public class XhtmlBrTypeImpl extends MinimalEObjectImpl implements XhtmlBrType {
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -51,9 +45,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -61,9 +55,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -71,9 +64,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -81,9 +73,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -91,9 +83,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -101,18 +93,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -120,9 +111,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -130,8 +121,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlBrTypeImpl() {
@@ -139,8 +130,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -149,8 +140,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -158,8 +149,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -170,8 +161,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -179,8 +170,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -191,8 +182,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -200,8 +191,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -214,8 +205,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -228,8 +219,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -237,8 +228,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -246,8 +237,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -258,113 +249,117 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_BR_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_BR_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_BR_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_BR_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_BR_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_BR_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_BR_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_BR_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_BR_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_BR_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_BR_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_BR_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_BR_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_BR_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_BR_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_BR_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_BR_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_BR_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_BR_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_BR_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_BR_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_BR_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_BR_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_BR_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_BR_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_BR_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_BR_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_BR_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_BR_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_BR_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_BR_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_BR_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (class: ");
+		result.append(" (class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", title: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlBrTypeImpl
+} // XhtmlBrTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlCaptionTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlCaptionTypeImpl.java
index 358775e..4a3c902 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlCaptionTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlCaptionTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -51,54 +45,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Caption Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Caption Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCaptionTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlCaptionTypeImpl extends EObjectImpl implements XhtmlCaptionType {
+public class XhtmlCaptionTypeImpl extends MinimalEObjectImpl implements XhtmlCaptionType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -106,9 +98,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -116,9 +108,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -126,9 +118,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -136,9 +127,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -146,9 +136,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -156,9 +146,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -166,9 +156,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -176,9 +166,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -186,18 +176,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -205,9 +194,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -215,9 +204,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -225,9 +214,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -235,8 +224,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlCaptionTypeImpl() {
@@ -244,8 +233,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -254,8 +243,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -266,17 +255,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlCaptionType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -284,8 +273,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -293,8 +282,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -302,8 +291,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -311,8 +300,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -320,8 +309,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -329,8 +318,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -338,8 +327,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -347,8 +336,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -356,8 +345,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -365,8 +354,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -374,8 +363,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -383,8 +372,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -392,8 +381,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -401,8 +390,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -410,8 +399,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -419,8 +408,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -428,8 +417,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -437,8 +426,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -446,8 +435,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -455,8 +444,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -464,8 +453,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -473,8 +462,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -482,8 +471,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -491,8 +480,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -500,8 +489,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -512,8 +501,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -521,8 +510,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -533,8 +522,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -542,8 +531,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -554,8 +543,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -563,8 +552,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -577,8 +566,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -591,8 +580,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -600,8 +589,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -609,8 +598,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -621,8 +610,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -630,8 +619,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -642,490 +631,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_CAPTION_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_CAPTION_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_CAPTION_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_CAPTION_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_CAPTION_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_CAPTION_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_CAPTION_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_CAPTION_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_CAPTION_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_CAPTION_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_CAPTION_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlCaptionTypeImpl
+} // XhtmlCaptionTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlCiteTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlCiteTypeImpl.java
index cf8460a..3343ed8 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlCiteTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlCiteTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -50,54 +44,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Cite Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Cite Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCiteTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlCiteTypeImpl extends EObjectImpl implements XhtmlCiteType {
+public class XhtmlCiteTypeImpl extends MinimalEObjectImpl implements XhtmlCiteType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -105,9 +97,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -115,9 +107,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -125,9 +117,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -135,9 +126,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -145,9 +135,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -155,9 +145,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -165,9 +155,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -175,9 +165,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -185,18 +175,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -204,9 +193,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -214,9 +203,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -224,9 +213,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -234,8 +223,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlCiteTypeImpl() {
@@ -243,8 +232,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -253,8 +242,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -265,17 +254,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlCiteType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlCiteType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -283,8 +272,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -292,8 +281,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -301,8 +290,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -310,8 +299,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -319,8 +308,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -328,8 +317,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -337,8 +326,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -346,8 +335,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -355,8 +344,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -364,8 +353,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -373,8 +362,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -382,8 +371,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -391,8 +380,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -400,8 +389,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -409,8 +398,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -418,8 +407,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -427,8 +416,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -436,8 +425,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -445,8 +434,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -454,8 +443,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -463,8 +452,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -472,8 +461,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -481,8 +470,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -490,8 +479,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -499,8 +488,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -511,8 +500,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -520,8 +509,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -532,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -541,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -553,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -562,8 +551,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -576,8 +565,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -590,8 +579,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -599,8 +588,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -608,8 +597,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -620,8 +609,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -629,8 +618,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -641,490 +630,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_CITE_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CITE_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CITE_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_CITE_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_CITE_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_CITE_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_CITE_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_CITE_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_CITE_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_CITE_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_CITE_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_CITE_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_CITE_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_CITE_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_CITE_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_CITE_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_CITE_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_CITE_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_CITE_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_CITE_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_CITE_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_CITE_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_CITE_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_CITE_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_CITE_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_CITE_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_CITE_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_CITE_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_CITE_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_CITE_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_CITE_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_CITE_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_CITE_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_CITE_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_CITE_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_CITE_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_CITE_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_CITE_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_CITE_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_CITE_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_CITE_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_CITE_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_CITE_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_CITE_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_CITE_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_CITE_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_CITE_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_CITE_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_CITE_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_CITE_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_CITE_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_CITE_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_CITE_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_CITE_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_CITE_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_CITE_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_CITE_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_CITE_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_CITE_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_CITE_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_CITE_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_CITE_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_CITE_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_CITE_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_CITE_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_CITE_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_CITE_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_CITE_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_CITE_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_CITE_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_CITE_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_CITE_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_CITE_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_CITE_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_CITE_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_CITE_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_CITE_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_CITE_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_CITE_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_CITE_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_CITE_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_CITE_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_CITE_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_CITE_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_CITE_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_CITE_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_CITE_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlCiteTypeImpl
+} // XhtmlCiteTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlCodeTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlCodeTypeImpl.java
index e41a92e..a5d50a6 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlCodeTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlCodeTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -50,54 +44,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Code Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Code Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlCodeTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlCodeTypeImpl extends EObjectImpl implements XhtmlCodeType {
+public class XhtmlCodeTypeImpl extends MinimalEObjectImpl implements XhtmlCodeType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -105,9 +97,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -115,9 +107,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -125,9 +117,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -135,9 +126,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -145,9 +135,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -155,9 +145,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -165,9 +155,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -175,9 +165,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -185,18 +175,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -204,9 +193,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -214,9 +203,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -224,9 +213,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -234,8 +223,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlCodeTypeImpl() {
@@ -243,8 +232,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -253,8 +242,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -265,17 +254,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlCodeType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlCodeType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -283,8 +272,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -292,8 +281,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -301,8 +290,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -310,8 +299,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -319,8 +308,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -328,8 +317,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -337,8 +326,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -346,8 +335,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -355,8 +344,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -364,8 +353,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -373,8 +362,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -382,8 +371,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -391,8 +380,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -400,8 +389,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -409,8 +398,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -418,8 +407,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -427,8 +416,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -436,8 +425,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -445,8 +434,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -454,8 +443,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -463,8 +452,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -472,8 +461,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -481,8 +470,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -490,8 +479,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -499,8 +488,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -511,8 +500,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -520,8 +509,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -532,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -541,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -553,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -562,8 +551,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -576,8 +565,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -590,8 +579,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -599,8 +588,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -608,8 +597,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -620,8 +609,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -629,8 +618,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -641,490 +630,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_CODE_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_CODE_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_CODE_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_CODE_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_CODE_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_CODE_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_CODE_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_CODE_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_CODE_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_CODE_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_CODE_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_CODE_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_CODE_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_CODE_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_CODE_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_CODE_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_CODE_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_CODE_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_CODE_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_CODE_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_CODE_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_CODE_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_CODE_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_CODE_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_CODE_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_CODE_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_CODE_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_CODE_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_CODE_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_CODE_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_CODE_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_CODE_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_CODE_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_CODE_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_CODE_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_CODE_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_CODE_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_CODE_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_CODE_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_CODE_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_CODE_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_CODE_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_CODE_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_CODE_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_CODE_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_CODE_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_CODE_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_CODE_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_CODE_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_CODE_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_CODE_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_CODE_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_CODE_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_CODE_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_CODE_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_CODE_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_CODE_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_CODE_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_CODE_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_CODE_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_CODE_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_CODE_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_CODE_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_CODE_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_CODE_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_CODE_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_CODE_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_CODE_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_CODE_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_CODE_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_CODE_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_CODE_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_CODE_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_CODE_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_CODE_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_CODE_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_CODE_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_CODE_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_CODE_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_CODE_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_CODE_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_CODE_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_CODE_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_CODE_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_CODE_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_CODE_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_CODE_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlCodeTypeImpl
+} // XhtmlCodeTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlColTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlColTypeImpl.java
index 0cfe161..6e4387f 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlColTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlColTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,48 +14,42 @@
 import java.math.BigInteger;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.AlignType;
 import org.eclipse.rmf.reqif10.xhtml.ValignType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlColType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Col Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Col Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getAlign <em>Align</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getChar <em>Char</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getCharoff <em>Charoff</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getValign <em>Valign</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getAlign <em>Align</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getChar <em>Char</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getCharoff <em>Charoff</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getValign <em>Valign</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColTypeImpl#getWidth <em>Width</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlColTypeImpl extends EObjectImpl implements XhtmlColType {
+public class XhtmlColTypeImpl extends MinimalEObjectImpl implements XhtmlColType {
 	/**
-	 * The default value of the '{@link #getAlign() <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAlign() <em>Align</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAlign()
 	 * @generated
 	 * @ordered
@@ -63,9 +57,9 @@
 	protected static final AlignType ALIGN_EDEFAULT = AlignType.LEFT;
 
 	/**
-	 * The cached value of the '{@link #getAlign() <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAlign() <em>Align</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getAlign()
 	 * @generated
 	 * @ordered
@@ -73,18 +67,17 @@
 	protected AlignType align = ALIGN_EDEFAULT;
 
 	/**
-	 * This is true if the Align attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Align attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean alignESet;
 
 	/**
-	 * The default value of the '{@link #getChar() <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getChar() <em>Char</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getChar()
 	 * @generated
 	 * @ordered
@@ -92,9 +85,9 @@
 	protected static final String CHAR_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getChar() <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getChar() <em>Char</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getChar()
 	 * @generated
 	 * @ordered
@@ -102,9 +95,9 @@
 	protected String char_ = CHAR_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCharoff() <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCharoff() <em>Charoff</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharoff()
 	 * @generated
 	 * @ordered
@@ -112,9 +105,9 @@
 	protected static final Object CHAROFF_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCharoff() <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCharoff() <em>Charoff</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharoff()
 	 * @generated
 	 * @ordered
@@ -122,9 +115,9 @@
 	protected Object charoff = CHAROFF_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -132,9 +125,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -142,9 +135,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -152,9 +144,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -162,9 +153,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -172,9 +163,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -182,9 +173,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -192,9 +183,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -202,28 +193,27 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getSpan() <em>Span</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpan() <em>Span</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpan()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final BigInteger SPAN_EDEFAULT = new BigInteger("1");
+	protected static final BigInteger SPAN_EDEFAULT = new BigInteger("1"); //$NON-NLS-1$
 
 	/**
-	 * The cached value of the '{@link #getSpan() <em>Span</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpan() <em>Span</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpan()
 	 * @generated
 	 * @ordered
@@ -231,18 +221,17 @@
 	protected BigInteger span = SPAN_EDEFAULT;
 
 	/**
-	 * This is true if the Span attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Span attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spanESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -250,9 +239,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -260,9 +249,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -270,9 +259,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -280,9 +269,9 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getValign() <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValign() <em>Valign</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValign()
 	 * @generated
 	 * @ordered
@@ -290,9 +279,9 @@
 	protected static final ValignType VALIGN_EDEFAULT = ValignType.TOP;
 
 	/**
-	 * The cached value of the '{@link #getValign() <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getValign() <em>Valign</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValign()
 	 * @generated
 	 * @ordered
@@ -300,18 +289,17 @@
 	protected ValignType valign = VALIGN_EDEFAULT;
 
 	/**
-	 * This is true if the Valign attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Valign attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean valignESet;
 
 	/**
-	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -319,9 +307,9 @@
 	protected static final Object WIDTH_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -329,8 +317,8 @@
 	protected Object width = WIDTH_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlColTypeImpl() {
@@ -338,8 +326,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -348,8 +336,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AlignType getAlign() {
@@ -357,8 +345,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAlign(AlignType newAlign) {
@@ -366,13 +354,14 @@
 		align = newAlign == null ? ALIGN_EDEFAULT : newAlign;
 		boolean oldAlignESet = alignESet;
 		alignESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COL_TYPE__ALIGN, oldAlign, align, !oldAlignESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetAlign() {
@@ -380,13 +369,14 @@
 		boolean oldAlignESet = alignESet;
 		align = ALIGN_EDEFAULT;
 		alignESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_COL_TYPE__ALIGN, oldAlign, ALIGN_EDEFAULT, oldAlignESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetAlign() {
@@ -394,8 +384,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getChar() {
@@ -403,20 +393,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setChar(String newChar) {
 		String oldChar = char_;
 		char_ = newChar;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COL_TYPE__CHAR, oldChar, char_));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getCharoff() {
@@ -424,20 +415,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCharoff(Object newCharoff) {
 		Object oldCharoff = charoff;
 		charoff = newCharoff;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COL_TYPE__CHAROFF, oldCharoff, charoff));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -445,20 +437,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
 		String oldClass = class_;
 		class_ = newClass;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COL_TYPE__CLASS, oldClass, class_));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -466,20 +459,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
 		String oldId = id;
 		id = newId;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COL_TYPE__ID, oldId, id));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -487,20 +481,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
 		String oldLang = lang;
 		lang = newLang;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COL_TYPE__LANG, oldLang, lang));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -508,8 +503,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -517,13 +512,14 @@
 		space = newSpace == null ? SPACE_EDEFAULT : newSpace;
 		boolean oldSpaceESet = spaceESet;
 		spaceESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COL_TYPE__SPACE, oldSpace, space, !oldSpaceESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -531,13 +527,14 @@
 		boolean oldSpaceESet = spaceESet;
 		space = SPACE_EDEFAULT;
 		spaceESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_COL_TYPE__SPACE, oldSpace, SPACE_EDEFAULT, oldSpaceESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -545,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger getSpan() {
@@ -554,8 +551,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpan(BigInteger newSpan) {
@@ -563,13 +560,14 @@
 		span = newSpan;
 		boolean oldSpanESet = spanESet;
 		spanESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COL_TYPE__SPAN, oldSpan, span, !oldSpanESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpan() {
@@ -577,13 +575,14 @@
 		boolean oldSpanESet = spanESet;
 		span = SPAN_EDEFAULT;
 		spanESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_COL_TYPE__SPAN, oldSpan, SPAN_EDEFAULT, oldSpanESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpan() {
@@ -591,8 +590,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -600,20 +599,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
 		String oldStyle = style;
 		style = newStyle;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COL_TYPE__STYLE, oldStyle, style));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -621,20 +621,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
 		String oldTitle = title;
 		title = newTitle;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COL_TYPE__TITLE, oldTitle, title));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ValignType getValign() {
@@ -642,8 +643,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValign(ValignType newValign) {
@@ -651,13 +652,14 @@
 		valign = newValign == null ? VALIGN_EDEFAULT : newValign;
 		boolean oldValignESet = valignESet;
 		valignESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COL_TYPE__VALIGN, oldValign, valign, !oldValignESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetValign() {
@@ -665,13 +667,14 @@
 		boolean oldValignESet = valignESet;
 		valign = VALIGN_EDEFAULT;
 		valignESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_COL_TYPE__VALIGN, oldValign, VALIGN_EDEFAULT, oldValignESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetValign() {
@@ -679,8 +682,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getWidth() {
@@ -688,221 +691,240 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setWidth(Object newWidth) {
 		Object oldWidth = width;
 		width = newWidth;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COL_TYPE__WIDTH, oldWidth, width));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_COL_TYPE__ALIGN:
-				return getAlign();
-			case XhtmlPackage.XHTML_COL_TYPE__CHAR:
-				return getChar();
-			case XhtmlPackage.XHTML_COL_TYPE__CHAROFF:
-				return getCharoff();
-			case XhtmlPackage.XHTML_COL_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_COL_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_COL_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_COL_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_COL_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_COL_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_COL_TYPE__TITLE:
-				return getTitle();
-			case XhtmlPackage.XHTML_COL_TYPE__VALIGN:
-				return getValign();
-			case XhtmlPackage.XHTML_COL_TYPE__WIDTH:
-				return getWidth();
+		case XhtmlPackage.XHTML_COL_TYPE__ALIGN:
+			return getAlign();
+		case XhtmlPackage.XHTML_COL_TYPE__CHAR:
+			return getChar();
+		case XhtmlPackage.XHTML_COL_TYPE__CHAROFF:
+			return getCharoff();
+		case XhtmlPackage.XHTML_COL_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_COL_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_COL_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_COL_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_COL_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_COL_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_COL_TYPE__TITLE:
+			return getTitle();
+		case XhtmlPackage.XHTML_COL_TYPE__VALIGN:
+			return getValign();
+		case XhtmlPackage.XHTML_COL_TYPE__WIDTH:
+			return getWidth();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_COL_TYPE__ALIGN:
-				setAlign((AlignType)newValue);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__CHAR:
-				setChar((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__CHAROFF:
-				setCharoff(newValue);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__SPAN:
-				setSpan((BigInteger)newValue);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__VALIGN:
-				setValign((ValignType)newValue);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__WIDTH:
-				setWidth(newValue);
-				return;
+		case XhtmlPackage.XHTML_COL_TYPE__ALIGN:
+			setAlign((AlignType) newValue);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__CHAR:
+			setChar((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__CHAROFF:
+			setCharoff(newValue);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__SPAN:
+			setSpan((BigInteger) newValue);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__VALIGN:
+			setValign((ValignType) newValue);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__WIDTH:
+			setWidth(newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_COL_TYPE__ALIGN:
-				unsetAlign();
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__CHAR:
-				setChar(CHAR_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__CHAROFF:
-				setCharoff(CHAROFF_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__SPAN:
-				unsetSpan();
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__VALIGN:
-				unsetValign();
-				return;
-			case XhtmlPackage.XHTML_COL_TYPE__WIDTH:
-				setWidth(WIDTH_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_COL_TYPE__ALIGN:
+			unsetAlign();
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__CHAR:
+			setChar(CHAR_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__CHAROFF:
+			setCharoff(CHAROFF_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__SPAN:
+			unsetSpan();
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__VALIGN:
+			unsetValign();
+			return;
+		case XhtmlPackage.XHTML_COL_TYPE__WIDTH:
+			setWidth(WIDTH_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_COL_TYPE__ALIGN:
-				return isSetAlign();
-			case XhtmlPackage.XHTML_COL_TYPE__CHAR:
-				return CHAR_EDEFAULT == null ? char_ != null : !CHAR_EDEFAULT.equals(char_);
-			case XhtmlPackage.XHTML_COL_TYPE__CHAROFF:
-				return CHAROFF_EDEFAULT == null ? charoff != null : !CHAROFF_EDEFAULT.equals(charoff);
-			case XhtmlPackage.XHTML_COL_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_COL_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_COL_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_COL_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_COL_TYPE__SPAN:
-				return isSetSpan();
-			case XhtmlPackage.XHTML_COL_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_COL_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-			case XhtmlPackage.XHTML_COL_TYPE__VALIGN:
-				return isSetValign();
-			case XhtmlPackage.XHTML_COL_TYPE__WIDTH:
-				return WIDTH_EDEFAULT == null ? width != null : !WIDTH_EDEFAULT.equals(width);
+		case XhtmlPackage.XHTML_COL_TYPE__ALIGN:
+			return isSetAlign();
+		case XhtmlPackage.XHTML_COL_TYPE__CHAR:
+			return CHAR_EDEFAULT == null ? char_ != null : !CHAR_EDEFAULT.equals(char_);
+		case XhtmlPackage.XHTML_COL_TYPE__CHAROFF:
+			return CHAROFF_EDEFAULT == null ? charoff != null : !CHAROFF_EDEFAULT.equals(charoff);
+		case XhtmlPackage.XHTML_COL_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_COL_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_COL_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_COL_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_COL_TYPE__SPAN:
+			return isSetSpan();
+		case XhtmlPackage.XHTML_COL_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_COL_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_COL_TYPE__VALIGN:
+			return isSetValign();
+		case XhtmlPackage.XHTML_COL_TYPE__WIDTH:
+			return WIDTH_EDEFAULT == null ? width != null : !WIDTH_EDEFAULT.equals(width);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy()) {
+			return super.toString();
+		}
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (align: ");
-		if (alignESet) result.append(align); else result.append("<unset>");
-		result.append(", char: ");
+		result.append(" (align: "); //$NON-NLS-1$
+		if (alignESet) {
+			result.append(align);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", char: "); //$NON-NLS-1$
 		result.append(char_);
-		result.append(", charoff: ");
+		result.append(", charoff: "); //$NON-NLS-1$
 		result.append(charoff);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", span: ");
-		if (spanESet) result.append(span); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet) {
+			result.append(space);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", span: "); //$NON-NLS-1$
+		if (spanESet) {
+			result.append(span);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
-		result.append(", valign: ");
-		if (valignESet) result.append(valign); else result.append("<unset>");
-		result.append(", width: ");
+		result.append(", valign: "); //$NON-NLS-1$
+		if (valignESet) {
+			result.append(valign);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", width: "); //$NON-NLS-1$
 		result.append(width);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlColTypeImpl
+} // XhtmlColTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlColgroupTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlColgroupTypeImpl.java
index ff343de..a4c57c0 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlColgroupTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlColgroupTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,25 +12,18 @@
 package org.eclipse.rmf.reqif10.xhtml.impl;
 
 import java.math.BigInteger;
-
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.AlignType;
 import org.eclipse.rmf.reqif10.xhtml.ValignType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlColType;
@@ -38,35 +31,33 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Colgroup Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Colgroup Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getCol <em>Col</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getAlign <em>Align</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getChar <em>Char</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getCharoff <em>Charoff</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getValign <em>Valign</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getCol <em>Col</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getAlign <em>Align</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getChar <em>Char</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getCharoff <em>Charoff</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getValign <em>Valign</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlColgroupTypeImpl#getWidth <em>Width</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlColgroupTypeImpl extends EObjectImpl implements XhtmlColgroupType {
+public class XhtmlColgroupTypeImpl extends MinimalEObjectImpl implements XhtmlColgroupType {
 	/**
-	 * The cached value of the '{@link #getCol() <em>Col</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCol() <em>Col</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCol()
 	 * @generated
 	 * @ordered
@@ -74,9 +65,9 @@
 	protected EList<XhtmlColType> col;
 
 	/**
-	 * The default value of the '{@link #getAlign() <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAlign() <em>Align</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAlign()
 	 * @generated
 	 * @ordered
@@ -84,9 +75,9 @@
 	protected static final AlignType ALIGN_EDEFAULT = AlignType.LEFT;
 
 	/**
-	 * The cached value of the '{@link #getAlign() <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAlign() <em>Align</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getAlign()
 	 * @generated
 	 * @ordered
@@ -94,18 +85,17 @@
 	protected AlignType align = ALIGN_EDEFAULT;
 
 	/**
-	 * This is true if the Align attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Align attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean alignESet;
 
 	/**
-	 * The default value of the '{@link #getChar() <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getChar() <em>Char</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getChar()
 	 * @generated
 	 * @ordered
@@ -113,9 +103,9 @@
 	protected static final String CHAR_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getChar() <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getChar() <em>Char</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getChar()
 	 * @generated
 	 * @ordered
@@ -123,9 +113,9 @@
 	protected String char_ = CHAR_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCharoff() <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCharoff() <em>Charoff</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharoff()
 	 * @generated
 	 * @ordered
@@ -133,9 +123,9 @@
 	protected static final Object CHAROFF_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCharoff() <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCharoff() <em>Charoff</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharoff()
 	 * @generated
 	 * @ordered
@@ -143,9 +133,9 @@
 	protected Object charoff = CHAROFF_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -153,9 +143,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -163,9 +153,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -173,9 +162,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -183,9 +171,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -193,9 +181,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -203,9 +191,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -213,9 +201,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -223,28 +211,27 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getSpan() <em>Span</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpan() <em>Span</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpan()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final BigInteger SPAN_EDEFAULT = new BigInteger("1");
+	protected static final BigInteger SPAN_EDEFAULT = new BigInteger("1"); //$NON-NLS-1$
 
 	/**
-	 * The cached value of the '{@link #getSpan() <em>Span</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpan() <em>Span</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpan()
 	 * @generated
 	 * @ordered
@@ -252,18 +239,17 @@
 	protected BigInteger span = SPAN_EDEFAULT;
 
 	/**
-	 * This is true if the Span attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Span attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spanESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -271,9 +257,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -281,9 +267,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -291,9 +277,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -301,9 +287,9 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getValign() <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValign() <em>Valign</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValign()
 	 * @generated
 	 * @ordered
@@ -311,9 +297,9 @@
 	protected static final ValignType VALIGN_EDEFAULT = ValignType.TOP;
 
 	/**
-	 * The cached value of the '{@link #getValign() <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getValign() <em>Valign</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValign()
 	 * @generated
 	 * @ordered
@@ -321,18 +307,17 @@
 	protected ValignType valign = VALIGN_EDEFAULT;
 
 	/**
-	 * This is true if the Valign attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Valign attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean valignESet;
 
 	/**
-	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -340,9 +325,9 @@
 	protected static final Object WIDTH_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -350,8 +335,8 @@
 	protected Object width = WIDTH_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlColgroupTypeImpl() {
@@ -359,8 +344,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -369,8 +354,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlColType> getCol() {
@@ -381,8 +366,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AlignType getAlign() {
@@ -390,8 +375,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAlign(AlignType newAlign) {
@@ -399,13 +384,14 @@
 		align = newAlign == null ? ALIGN_EDEFAULT : newAlign;
 		boolean oldAlignESet = alignESet;
 		alignESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COLGROUP_TYPE__ALIGN, oldAlign, align, !oldAlignESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetAlign() {
@@ -413,13 +399,14 @@
 		boolean oldAlignESet = alignESet;
 		align = ALIGN_EDEFAULT;
 		alignESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_COLGROUP_TYPE__ALIGN, oldAlign, ALIGN_EDEFAULT, oldAlignESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetAlign() {
@@ -427,8 +414,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getChar() {
@@ -436,20 +423,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setChar(String newChar) {
 		String oldChar = char_;
 		char_ = newChar;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COLGROUP_TYPE__CHAR, oldChar, char_));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getCharoff() {
@@ -457,20 +445,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCharoff(Object newCharoff) {
 		Object oldCharoff = charoff;
 		charoff = newCharoff;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COLGROUP_TYPE__CHAROFF, oldCharoff, charoff));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -478,20 +467,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
 		String oldClass = class_;
 		class_ = newClass;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COLGROUP_TYPE__CLASS, oldClass, class_));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -499,20 +489,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
 		String oldId = id;
 		id = newId;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COLGROUP_TYPE__ID, oldId, id));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -520,20 +511,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
 		String oldLang = lang;
 		lang = newLang;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COLGROUP_TYPE__LANG, oldLang, lang));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -541,8 +533,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -550,13 +542,14 @@
 		space = newSpace == null ? SPACE_EDEFAULT : newSpace;
 		boolean oldSpaceESet = spaceESet;
 		spaceESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COLGROUP_TYPE__SPACE, oldSpace, space, !oldSpaceESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -564,13 +557,14 @@
 		boolean oldSpaceESet = spaceESet;
 		space = SPACE_EDEFAULT;
 		spaceESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_COLGROUP_TYPE__SPACE, oldSpace, SPACE_EDEFAULT, oldSpaceESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -578,8 +572,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger getSpan() {
@@ -587,8 +581,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpan(BigInteger newSpan) {
@@ -596,13 +590,14 @@
 		span = newSpan;
 		boolean oldSpanESet = spanESet;
 		spanESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COLGROUP_TYPE__SPAN, oldSpan, span, !oldSpanESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpan() {
@@ -610,13 +605,14 @@
 		boolean oldSpanESet = spanESet;
 		span = SPAN_EDEFAULT;
 		spanESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_COLGROUP_TYPE__SPAN, oldSpan, SPAN_EDEFAULT, oldSpanESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpan() {
@@ -624,8 +620,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -633,20 +629,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
 		String oldStyle = style;
 		style = newStyle;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COLGROUP_TYPE__STYLE, oldStyle, style));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -654,20 +651,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
 		String oldTitle = title;
 		title = newTitle;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COLGROUP_TYPE__TITLE, oldTitle, title));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ValignType getValign() {
@@ -675,8 +673,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValign(ValignType newValign) {
@@ -684,13 +682,14 @@
 		valign = newValign == null ? VALIGN_EDEFAULT : newValign;
 		boolean oldValignESet = valignESet;
 		valignESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COLGROUP_TYPE__VALIGN, oldValign, valign, !oldValignESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetValign() {
@@ -698,13 +697,15 @@
 		boolean oldValignESet = valignESet;
 		valign = VALIGN_EDEFAULT;
 		valignESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_COLGROUP_TYPE__VALIGN, oldValign, VALIGN_EDEFAULT, oldValignESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_COLGROUP_TYPE__VALIGN, oldValign, VALIGN_EDEFAULT,
+					oldValignESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetValign() {
@@ -712,8 +713,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getWidth() {
@@ -721,247 +722,266 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setWidth(Object newWidth) {
 		Object oldWidth = width;
 		width = newWidth;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_COLGROUP_TYPE__WIDTH, oldWidth, width));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__COL:
-				return ((InternalEList<?>)getCol()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__COL:
+			return ((InternalEList<?>) getCol()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__COL:
-				return getCol();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__ALIGN:
-				return getAlign();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAR:
-				return getChar();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAROFF:
-				return getCharoff();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__TITLE:
-				return getTitle();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__VALIGN:
-				return getValign();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__WIDTH:
-				return getWidth();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__COL:
+			return getCol();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__ALIGN:
+			return getAlign();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAR:
+			return getChar();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAROFF:
+			return getCharoff();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__TITLE:
+			return getTitle();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__VALIGN:
+			return getValign();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__WIDTH:
+			return getWidth();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__COL:
-				getCol().clear();
-				getCol().addAll((Collection<? extends XhtmlColType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__ALIGN:
-				setAlign((AlignType)newValue);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAR:
-				setChar((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAROFF:
-				setCharoff(newValue);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__SPAN:
-				setSpan((BigInteger)newValue);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__VALIGN:
-				setValign((ValignType)newValue);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__WIDTH:
-				setWidth(newValue);
-				return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__COL:
+			getCol().clear();
+			getCol().addAll((Collection<? extends XhtmlColType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__ALIGN:
+			setAlign((AlignType) newValue);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAR:
+			setChar((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAROFF:
+			setCharoff(newValue);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__SPAN:
+			setSpan((BigInteger) newValue);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__VALIGN:
+			setValign((ValignType) newValue);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__WIDTH:
+			setWidth(newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__COL:
-				getCol().clear();
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__ALIGN:
-				unsetAlign();
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAR:
-				setChar(CHAR_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAROFF:
-				setCharoff(CHAROFF_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__SPAN:
-				unsetSpan();
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__VALIGN:
-				unsetValign();
-				return;
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__WIDTH:
-				setWidth(WIDTH_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__COL:
+			getCol().clear();
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__ALIGN:
+			unsetAlign();
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAR:
+			setChar(CHAR_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAROFF:
+			setCharoff(CHAROFF_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__SPAN:
+			unsetSpan();
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__VALIGN:
+			unsetValign();
+			return;
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__WIDTH:
+			setWidth(WIDTH_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__COL:
-				return col != null && !col.isEmpty();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__ALIGN:
-				return isSetAlign();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAR:
-				return CHAR_EDEFAULT == null ? char_ != null : !CHAR_EDEFAULT.equals(char_);
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAROFF:
-				return CHAROFF_EDEFAULT == null ? charoff != null : !CHAROFF_EDEFAULT.equals(charoff);
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__SPAN:
-				return isSetSpan();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__VALIGN:
-				return isSetValign();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE__WIDTH:
-				return WIDTH_EDEFAULT == null ? width != null : !WIDTH_EDEFAULT.equals(width);
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__COL:
+			return col != null && !col.isEmpty();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__ALIGN:
+			return isSetAlign();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAR:
+			return CHAR_EDEFAULT == null ? char_ != null : !CHAR_EDEFAULT.equals(char_);
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__CHAROFF:
+			return CHAROFF_EDEFAULT == null ? charoff != null : !CHAROFF_EDEFAULT.equals(charoff);
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__SPAN:
+			return isSetSpan();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__VALIGN:
+			return isSetValign();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE__WIDTH:
+			return WIDTH_EDEFAULT == null ? width != null : !WIDTH_EDEFAULT.equals(width);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy()) {
+			return super.toString();
+		}
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (align: ");
-		if (alignESet) result.append(align); else result.append("<unset>");
-		result.append(", char: ");
+		result.append(" (align: "); //$NON-NLS-1$
+		if (alignESet) {
+			result.append(align);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", char: "); //$NON-NLS-1$
 		result.append(char_);
-		result.append(", charoff: ");
+		result.append(", charoff: "); //$NON-NLS-1$
 		result.append(charoff);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", span: ");
-		if (spanESet) result.append(span); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet) {
+			result.append(space);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", span: "); //$NON-NLS-1$
+		if (spanESet) {
+			result.append(span);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
-		result.append(", valign: ");
-		if (valignESet) result.append(valign); else result.append("<unset>");
-		result.append(", width: ");
+		result.append(", valign: "); //$NON-NLS-1$
+		if (valignESet) {
+			result.append(valign);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", width: "); //$NON-NLS-1$
 		result.append(width);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlColgroupTypeImpl
+} // XhtmlColgroupTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDdTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDdTypeImpl.java
index 85a4515..ddeee9a 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDdTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDdTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -67,70 +61,68 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Dd Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Dd Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getH1 <em>H1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getH2 <em>H2</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getH3 <em>H3</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getH4 <em>H4</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getH5 <em>H5</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getH6 <em>H6</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getUl <em>Ul</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getOl <em>Ol</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getDl <em>Dl</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getPre <em>Pre</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getBlockquote <em>Blockquote</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getHr <em>Hr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getH1 <em>H1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getH2 <em>H2</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getH3 <em>H3</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getH4 <em>H4</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getH5 <em>H5</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getH6 <em>H6</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getUl <em>Ul</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getOl <em>Ol</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getDl <em>Dl</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getPre <em>Pre</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getBlockquote <em>Blockquote</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getAddress <em>Address</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getHr <em>Hr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDdTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlDdTypeImpl extends EObjectImpl implements XhtmlDdType {
+public class XhtmlDdTypeImpl extends MinimalEObjectImpl implements XhtmlDdType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -138,9 +130,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -148,9 +140,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -158,9 +150,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -168,9 +159,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -178,9 +168,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -188,9 +178,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -198,9 +188,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -208,9 +198,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -218,18 +208,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -237,9 +226,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -247,9 +236,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -257,9 +246,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -267,8 +256,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlDdTypeImpl() {
@@ -276,8 +265,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -286,8 +275,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -298,17 +287,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlFlowMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlDdType_XhtmlFlowMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlDdType_XhtmlFlowMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH1Type> getH1() {
@@ -316,8 +305,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH2Type> getH2() {
@@ -325,8 +314,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH3Type> getH3() {
@@ -334,8 +323,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH4Type> getH4() {
@@ -343,8 +332,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH5Type> getH5() {
@@ -352,8 +341,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH6Type> getH6() {
@@ -361,8 +350,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlUlType> getUl() {
@@ -370,8 +359,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlOlType> getOl() {
@@ -379,8 +368,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDlType> getDl() {
@@ -388,8 +377,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlPType> getP() {
@@ -397,8 +386,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDivType> getDiv() {
@@ -406,8 +395,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlPreType> getPre() {
@@ -415,8 +404,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBlockquoteType> getBlockquote() {
@@ -424,8 +413,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAddressType> getAddress() {
@@ -433,8 +422,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlHrType> getHr() {
@@ -442,8 +431,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlTableType> getTable() {
@@ -451,8 +440,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -460,8 +449,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -469,8 +458,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -478,8 +467,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -487,8 +476,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -496,8 +485,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -505,8 +494,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -514,8 +503,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -523,8 +512,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -532,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -541,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -550,8 +539,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -559,8 +548,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -568,8 +557,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -577,8 +566,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -586,8 +575,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -595,8 +584,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -604,8 +593,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -613,8 +602,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -622,8 +611,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -631,8 +620,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -640,8 +629,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -649,8 +638,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -658,8 +647,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -667,8 +656,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -676,8 +665,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -688,8 +677,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -697,8 +686,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -709,8 +698,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -718,8 +707,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -730,8 +719,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -739,8 +728,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -753,8 +742,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -767,8 +756,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -776,8 +765,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -785,8 +774,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -797,8 +786,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -806,8 +795,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -818,698 +807,704 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DD_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__XHTML_FLOW_MIX:
-				return ((InternalEList<?>)getXhtmlFlowMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__H1:
-				return ((InternalEList<?>)getH1()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__H2:
-				return ((InternalEList<?>)getH2()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__H3:
-				return ((InternalEList<?>)getH3()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__H4:
-				return ((InternalEList<?>)getH4()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__H5:
-				return ((InternalEList<?>)getH5()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__H6:
-				return ((InternalEList<?>)getH6()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__UL:
-				return ((InternalEList<?>)getUl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__OL:
-				return ((InternalEList<?>)getOl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__DL:
-				return ((InternalEList<?>)getDl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__P:
-				return ((InternalEList<?>)getP()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__DIV:
-				return ((InternalEList<?>)getDiv()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__PRE:
-				return ((InternalEList<?>)getPre()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__BLOCKQUOTE:
-				return ((InternalEList<?>)getBlockquote()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__ADDRESS:
-				return ((InternalEList<?>)getAddress()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__HR:
-				return ((InternalEList<?>)getHr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__TABLE:
-				return ((InternalEList<?>)getTable()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DD_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__XHTML_FLOW_MIX:
+			return ((InternalEList<?>) getXhtmlFlowMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__H1:
+			return ((InternalEList<?>) getH1()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__H2:
+			return ((InternalEList<?>) getH2()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__H3:
+			return ((InternalEList<?>) getH3()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__H4:
+			return ((InternalEList<?>) getH4()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__H5:
+			return ((InternalEList<?>) getH5()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__H6:
+			return ((InternalEList<?>) getH6()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__UL:
+			return ((InternalEList<?>) getUl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__OL:
+			return ((InternalEList<?>) getOl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__DL:
+			return ((InternalEList<?>) getDl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__P:
+			return ((InternalEList<?>) getP()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__DIV:
+			return ((InternalEList<?>) getDiv()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__PRE:
+			return ((InternalEList<?>) getPre()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__BLOCKQUOTE:
+			return ((InternalEList<?>) getBlockquote()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__ADDRESS:
+			return ((InternalEList<?>) getAddress()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__HR:
+			return ((InternalEList<?>) getHr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__TABLE:
+			return ((InternalEList<?>) getTable()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DD_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DD_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_DD_TYPE__XHTML_FLOW_MIX:
-				if (coreType) return getXhtmlFlowMix();
-				return ((FeatureMap.Internal)getXhtmlFlowMix()).getWrapper();
-			case XhtmlPackage.XHTML_DD_TYPE__H1:
-				return getH1();
-			case XhtmlPackage.XHTML_DD_TYPE__H2:
-				return getH2();
-			case XhtmlPackage.XHTML_DD_TYPE__H3:
-				return getH3();
-			case XhtmlPackage.XHTML_DD_TYPE__H4:
-				return getH4();
-			case XhtmlPackage.XHTML_DD_TYPE__H5:
-				return getH5();
-			case XhtmlPackage.XHTML_DD_TYPE__H6:
-				return getH6();
-			case XhtmlPackage.XHTML_DD_TYPE__UL:
-				return getUl();
-			case XhtmlPackage.XHTML_DD_TYPE__OL:
-				return getOl();
-			case XhtmlPackage.XHTML_DD_TYPE__DL:
-				return getDl();
-			case XhtmlPackage.XHTML_DD_TYPE__P:
-				return getP();
-			case XhtmlPackage.XHTML_DD_TYPE__DIV:
-				return getDiv();
-			case XhtmlPackage.XHTML_DD_TYPE__PRE:
-				return getPre();
-			case XhtmlPackage.XHTML_DD_TYPE__BLOCKQUOTE:
-				return getBlockquote();
-			case XhtmlPackage.XHTML_DD_TYPE__ADDRESS:
-				return getAddress();
-			case XhtmlPackage.XHTML_DD_TYPE__HR:
-				return getHr();
-			case XhtmlPackage.XHTML_DD_TYPE__TABLE:
-				return getTable();
-			case XhtmlPackage.XHTML_DD_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_DD_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_DD_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_DD_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_DD_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_DD_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_DD_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_DD_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_DD_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_DD_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_DD_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_DD_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_DD_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_DD_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_DD_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_DD_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_DD_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_DD_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_DD_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_DD_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_DD_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_DD_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_DD_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_DD_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_DD_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_DD_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_DD_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_DD_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_DD_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_DD_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_DD_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_DD_TYPE__XHTML_FLOW_MIX:
+			if (coreType)
+				return getXhtmlFlowMix();
+			return ((FeatureMap.Internal) getXhtmlFlowMix()).getWrapper();
+		case XhtmlPackage.XHTML_DD_TYPE__H1:
+			return getH1();
+		case XhtmlPackage.XHTML_DD_TYPE__H2:
+			return getH2();
+		case XhtmlPackage.XHTML_DD_TYPE__H3:
+			return getH3();
+		case XhtmlPackage.XHTML_DD_TYPE__H4:
+			return getH4();
+		case XhtmlPackage.XHTML_DD_TYPE__H5:
+			return getH5();
+		case XhtmlPackage.XHTML_DD_TYPE__H6:
+			return getH6();
+		case XhtmlPackage.XHTML_DD_TYPE__UL:
+			return getUl();
+		case XhtmlPackage.XHTML_DD_TYPE__OL:
+			return getOl();
+		case XhtmlPackage.XHTML_DD_TYPE__DL:
+			return getDl();
+		case XhtmlPackage.XHTML_DD_TYPE__P:
+			return getP();
+		case XhtmlPackage.XHTML_DD_TYPE__DIV:
+			return getDiv();
+		case XhtmlPackage.XHTML_DD_TYPE__PRE:
+			return getPre();
+		case XhtmlPackage.XHTML_DD_TYPE__BLOCKQUOTE:
+			return getBlockquote();
+		case XhtmlPackage.XHTML_DD_TYPE__ADDRESS:
+			return getAddress();
+		case XhtmlPackage.XHTML_DD_TYPE__HR:
+			return getHr();
+		case XhtmlPackage.XHTML_DD_TYPE__TABLE:
+			return getTable();
+		case XhtmlPackage.XHTML_DD_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_DD_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_DD_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_DD_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_DD_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_DD_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_DD_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_DD_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_DD_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_DD_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_DD_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_DD_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_DD_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_DD_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_DD_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_DD_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_DD_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_DD_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_DD_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_DD_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_DD_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_DD_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_DD_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_DD_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_DD_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_DD_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_DD_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_DD_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_DD_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_DD_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DD_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__XHTML_FLOW_MIX:
-				((FeatureMap.Internal)getXhtmlFlowMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__H1:
-				getH1().clear();
-				getH1().addAll((Collection<? extends XhtmlH1Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__H2:
-				getH2().clear();
-				getH2().addAll((Collection<? extends XhtmlH2Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__H3:
-				getH3().clear();
-				getH3().addAll((Collection<? extends XhtmlH3Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__H4:
-				getH4().clear();
-				getH4().addAll((Collection<? extends XhtmlH4Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__H5:
-				getH5().clear();
-				getH5().addAll((Collection<? extends XhtmlH5Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__H6:
-				getH6().clear();
-				getH6().addAll((Collection<? extends XhtmlH6Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__UL:
-				getUl().clear();
-				getUl().addAll((Collection<? extends XhtmlUlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__OL:
-				getOl().clear();
-				getOl().addAll((Collection<? extends XhtmlOlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__DL:
-				getDl().clear();
-				getDl().addAll((Collection<? extends XhtmlDlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__P:
-				getP().clear();
-				getP().addAll((Collection<? extends XhtmlPType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__DIV:
-				getDiv().clear();
-				getDiv().addAll((Collection<? extends XhtmlDivType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__PRE:
-				getPre().clear();
-				getPre().addAll((Collection<? extends XhtmlPreType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__BLOCKQUOTE:
-				getBlockquote().clear();
-				getBlockquote().addAll((Collection<? extends XhtmlBlockquoteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__ADDRESS:
-				getAddress().clear();
-				getAddress().addAll((Collection<? extends XhtmlAddressType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__HR:
-				getHr().clear();
-				getHr().addAll((Collection<? extends XhtmlHrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__TABLE:
-				getTable().clear();
-				getTable().addAll((Collection<? extends XhtmlTableType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_DD_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__XHTML_FLOW_MIX:
+			((FeatureMap.Internal) getXhtmlFlowMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__H1:
+			getH1().clear();
+			getH1().addAll((Collection<? extends XhtmlH1Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__H2:
+			getH2().clear();
+			getH2().addAll((Collection<? extends XhtmlH2Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__H3:
+			getH3().clear();
+			getH3().addAll((Collection<? extends XhtmlH3Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__H4:
+			getH4().clear();
+			getH4().addAll((Collection<? extends XhtmlH4Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__H5:
+			getH5().clear();
+			getH5().addAll((Collection<? extends XhtmlH5Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__H6:
+			getH6().clear();
+			getH6().addAll((Collection<? extends XhtmlH6Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__UL:
+			getUl().clear();
+			getUl().addAll((Collection<? extends XhtmlUlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__OL:
+			getOl().clear();
+			getOl().addAll((Collection<? extends XhtmlOlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__DL:
+			getDl().clear();
+			getDl().addAll((Collection<? extends XhtmlDlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__P:
+			getP().clear();
+			getP().addAll((Collection<? extends XhtmlPType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__DIV:
+			getDiv().clear();
+			getDiv().addAll((Collection<? extends XhtmlDivType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__PRE:
+			getPre().clear();
+			getPre().addAll((Collection<? extends XhtmlPreType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__BLOCKQUOTE:
+			getBlockquote().clear();
+			getBlockquote().addAll((Collection<? extends XhtmlBlockquoteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__ADDRESS:
+			getAddress().clear();
+			getAddress().addAll((Collection<? extends XhtmlAddressType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__HR:
+			getHr().clear();
+			getHr().addAll((Collection<? extends XhtmlHrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__TABLE:
+			getTable().clear();
+			getTable().addAll((Collection<? extends XhtmlTableType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DD_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__XHTML_FLOW_MIX:
-				getXhtmlFlowMix().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__H1:
-				getH1().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__H2:
-				getH2().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__H3:
-				getH3().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__H4:
-				getH4().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__H5:
-				getH5().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__H6:
-				getH6().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__UL:
-				getUl().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__OL:
-				getOl().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__DL:
-				getDl().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__P:
-				getP().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__DIV:
-				getDiv().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__PRE:
-				getPre().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__BLOCKQUOTE:
-				getBlockquote().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__ADDRESS:
-				getAddress().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__HR:
-				getHr().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__TABLE:
-				getTable().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DD_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_DD_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__XHTML_FLOW_MIX:
+			getXhtmlFlowMix().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__H1:
+			getH1().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__H2:
+			getH2().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__H3:
+			getH3().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__H4:
+			getH4().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__H5:
+			getH5().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__H6:
+			getH6().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__UL:
+			getUl().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__OL:
+			getOl().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__DL:
+			getDl().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__P:
+			getP().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__DIV:
+			getDiv().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__PRE:
+			getPre().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__BLOCKQUOTE:
+			getBlockquote().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__ADDRESS:
+			getAddress().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__HR:
+			getHr().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__TABLE:
+			getTable().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DD_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DD_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__XHTML_FLOW_MIX:
-				return !getXhtmlFlowMix().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__H1:
-				return !getH1().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__H2:
-				return !getH2().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__H3:
-				return !getH3().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__H4:
-				return !getH4().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__H5:
-				return !getH5().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__H6:
-				return !getH6().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__UL:
-				return !getUl().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__OL:
-				return !getOl().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__DL:
-				return !getDl().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__P:
-				return !getP().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__DIV:
-				return !getDiv().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__PRE:
-				return !getPre().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__BLOCKQUOTE:
-				return !getBlockquote().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__ADDRESS:
-				return !getAddress().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__HR:
-				return !getHr().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__TABLE:
-				return !getTable().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_DD_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_DD_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_DD_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_DD_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_DD_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_DD_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_DD_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__XHTML_FLOW_MIX:
+			return !getXhtmlFlowMix().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__H1:
+			return !getH1().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__H2:
+			return !getH2().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__H3:
+			return !getH3().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__H4:
+			return !getH4().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__H5:
+			return !getH5().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__H6:
+			return !getH6().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__UL:
+			return !getUl().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__OL:
+			return !getOl().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__DL:
+			return !getDl().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__P:
+			return !getP().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__DIV:
+			return !getDiv().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__PRE:
+			return !getPre().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__BLOCKQUOTE:
+			return !getBlockquote().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__ADDRESS:
+			return !getAddress().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__HR:
+			return !getHr().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__TABLE:
+			return !getTable().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_DD_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_DD_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_DD_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_DD_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_DD_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_DD_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlDdTypeImpl
+} // XhtmlDdTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDfnTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDfnTypeImpl.java
index 7f4d37a..acd983b 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDfnTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDfnTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -50,54 +44,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Dfn Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Dfn Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDfnTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlDfnTypeImpl extends EObjectImpl implements XhtmlDfnType {
+public class XhtmlDfnTypeImpl extends MinimalEObjectImpl implements XhtmlDfnType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -105,9 +97,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -115,9 +107,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -125,9 +117,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -135,9 +126,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -145,9 +135,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -155,9 +145,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -165,9 +155,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -175,9 +165,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -185,18 +175,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -204,9 +193,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -214,9 +203,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -224,9 +213,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -234,8 +223,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlDfnTypeImpl() {
@@ -243,8 +232,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -253,8 +242,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -265,17 +254,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlDfnType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlDfnType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -283,8 +272,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -292,8 +281,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -301,8 +290,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -310,8 +299,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -319,8 +308,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -328,8 +317,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -337,8 +326,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -346,8 +335,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -355,8 +344,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -364,8 +353,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -373,8 +362,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -382,8 +371,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -391,8 +380,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -400,8 +389,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -409,8 +398,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -418,8 +407,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -427,8 +416,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -436,8 +425,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -445,8 +434,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -454,8 +443,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -463,8 +452,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -472,8 +461,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -481,8 +470,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -490,8 +479,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -499,8 +488,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -511,8 +500,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -520,8 +509,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -532,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -541,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -553,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -562,8 +551,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -576,8 +565,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -590,8 +579,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -599,8 +588,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -608,8 +597,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -620,8 +609,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -629,8 +618,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -641,490 +630,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DFN_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DFN_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DFN_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DFN_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_DFN_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_DFN_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_DFN_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_DFN_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_DFN_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_DFN_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_DFN_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_DFN_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_DFN_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_DFN_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_DFN_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_DFN_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_DFN_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_DFN_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_DFN_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_DFN_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_DFN_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_DFN_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_DFN_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_DFN_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_DFN_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_DFN_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_DFN_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_DFN_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_DFN_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_DFN_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_DFN_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_DFN_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_DFN_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_DFN_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_DFN_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_DFN_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_DFN_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_DFN_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_DFN_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_DFN_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_DFN_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_DFN_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_DFN_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_DFN_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_DFN_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_DFN_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_DFN_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_DFN_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_DFN_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_DFN_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_DFN_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_DFN_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_DFN_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_DFN_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_DFN_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_DFN_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_DFN_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_DFN_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_DFN_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_DFN_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_DFN_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_DFN_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_DFN_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_DFN_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_DFN_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_DFN_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_DFN_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DFN_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_DFN_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DFN_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DFN_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_DFN_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DFN_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DFN_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_DFN_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_DFN_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_DFN_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_DFN_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_DFN_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_DFN_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_DFN_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_DFN_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_DFN_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_DFN_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_DFN_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_DFN_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_DFN_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlDfnTypeImpl
+} // XhtmlDfnTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDivTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDivTypeImpl.java
index 2047512..a07013a 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDivTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDivTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -66,70 +60,68 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Div Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Div Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getH1 <em>H1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getH2 <em>H2</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getH3 <em>H3</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getH4 <em>H4</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getH5 <em>H5</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getH6 <em>H6</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getUl <em>Ul</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getOl <em>Ol</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getDl <em>Dl</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getPre <em>Pre</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getBlockquote <em>Blockquote</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getHr <em>Hr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getH1 <em>H1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getH2 <em>H2</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getH3 <em>H3</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getH4 <em>H4</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getH5 <em>H5</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getH6 <em>H6</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getUl <em>Ul</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getOl <em>Ol</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getDl <em>Dl</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getPre <em>Pre</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getBlockquote <em>Blockquote</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getAddress <em>Address</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getHr <em>Hr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDivTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlDivTypeImpl extends EObjectImpl implements XhtmlDivType {
+public class XhtmlDivTypeImpl extends MinimalEObjectImpl implements XhtmlDivType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -137,9 +129,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -147,9 +139,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -157,9 +149,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -167,9 +158,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -177,9 +167,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -187,9 +177,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -197,9 +187,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -207,9 +197,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -217,18 +207,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -236,9 +225,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -246,9 +235,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -256,9 +245,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -266,8 +255,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlDivTypeImpl() {
@@ -275,8 +264,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -285,8 +274,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -297,17 +286,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlFlowMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlDivType_XhtmlFlowMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlDivType_XhtmlFlowMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH1Type> getH1() {
@@ -315,8 +304,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH2Type> getH2() {
@@ -324,8 +313,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH3Type> getH3() {
@@ -333,8 +322,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH4Type> getH4() {
@@ -342,8 +331,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH5Type> getH5() {
@@ -351,8 +340,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH6Type> getH6() {
@@ -360,8 +349,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlUlType> getUl() {
@@ -369,8 +358,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlOlType> getOl() {
@@ -378,8 +367,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDlType> getDl() {
@@ -387,8 +376,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlPType> getP() {
@@ -396,8 +385,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDivType> getDiv() {
@@ -405,8 +394,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlPreType> getPre() {
@@ -414,8 +403,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBlockquoteType> getBlockquote() {
@@ -423,8 +412,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAddressType> getAddress() {
@@ -432,8 +421,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlHrType> getHr() {
@@ -441,8 +430,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlTableType> getTable() {
@@ -450,8 +439,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -459,8 +448,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -468,8 +457,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -477,8 +466,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -486,8 +475,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -495,8 +484,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -504,8 +493,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -513,8 +502,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -522,8 +511,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -531,8 +520,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -540,8 +529,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -549,8 +538,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -558,8 +547,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -567,8 +556,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -576,8 +565,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -585,8 +574,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -594,8 +583,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -603,8 +592,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -612,8 +601,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -621,8 +610,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -630,8 +619,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -639,8 +628,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -648,8 +637,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -657,8 +646,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -666,8 +655,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -675,8 +664,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -687,8 +676,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -696,8 +685,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -708,8 +697,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -717,8 +706,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -729,8 +718,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -738,8 +727,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -752,8 +741,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -766,8 +755,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -775,8 +764,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -784,8 +773,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -796,8 +785,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -805,8 +794,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -817,698 +806,704 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DIV_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__XHTML_FLOW_MIX:
-				return ((InternalEList<?>)getXhtmlFlowMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__H1:
-				return ((InternalEList<?>)getH1()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__H2:
-				return ((InternalEList<?>)getH2()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__H3:
-				return ((InternalEList<?>)getH3()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__H4:
-				return ((InternalEList<?>)getH4()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__H5:
-				return ((InternalEList<?>)getH5()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__H6:
-				return ((InternalEList<?>)getH6()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__UL:
-				return ((InternalEList<?>)getUl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__OL:
-				return ((InternalEList<?>)getOl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__DL:
-				return ((InternalEList<?>)getDl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__P:
-				return ((InternalEList<?>)getP()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__DIV:
-				return ((InternalEList<?>)getDiv()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__PRE:
-				return ((InternalEList<?>)getPre()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__BLOCKQUOTE:
-				return ((InternalEList<?>)getBlockquote()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__ADDRESS:
-				return ((InternalEList<?>)getAddress()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__HR:
-				return ((InternalEList<?>)getHr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__TABLE:
-				return ((InternalEList<?>)getTable()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DIV_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__XHTML_FLOW_MIX:
+			return ((InternalEList<?>) getXhtmlFlowMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__H1:
+			return ((InternalEList<?>) getH1()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__H2:
+			return ((InternalEList<?>) getH2()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__H3:
+			return ((InternalEList<?>) getH3()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__H4:
+			return ((InternalEList<?>) getH4()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__H5:
+			return ((InternalEList<?>) getH5()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__H6:
+			return ((InternalEList<?>) getH6()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__UL:
+			return ((InternalEList<?>) getUl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__OL:
+			return ((InternalEList<?>) getOl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__DL:
+			return ((InternalEList<?>) getDl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__P:
+			return ((InternalEList<?>) getP()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__DIV:
+			return ((InternalEList<?>) getDiv()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__PRE:
+			return ((InternalEList<?>) getPre()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__BLOCKQUOTE:
+			return ((InternalEList<?>) getBlockquote()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__ADDRESS:
+			return ((InternalEList<?>) getAddress()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__HR:
+			return ((InternalEList<?>) getHr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__TABLE:
+			return ((InternalEList<?>) getTable()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DIV_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DIV_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_DIV_TYPE__XHTML_FLOW_MIX:
-				if (coreType) return getXhtmlFlowMix();
-				return ((FeatureMap.Internal)getXhtmlFlowMix()).getWrapper();
-			case XhtmlPackage.XHTML_DIV_TYPE__H1:
-				return getH1();
-			case XhtmlPackage.XHTML_DIV_TYPE__H2:
-				return getH2();
-			case XhtmlPackage.XHTML_DIV_TYPE__H3:
-				return getH3();
-			case XhtmlPackage.XHTML_DIV_TYPE__H4:
-				return getH4();
-			case XhtmlPackage.XHTML_DIV_TYPE__H5:
-				return getH5();
-			case XhtmlPackage.XHTML_DIV_TYPE__H6:
-				return getH6();
-			case XhtmlPackage.XHTML_DIV_TYPE__UL:
-				return getUl();
-			case XhtmlPackage.XHTML_DIV_TYPE__OL:
-				return getOl();
-			case XhtmlPackage.XHTML_DIV_TYPE__DL:
-				return getDl();
-			case XhtmlPackage.XHTML_DIV_TYPE__P:
-				return getP();
-			case XhtmlPackage.XHTML_DIV_TYPE__DIV:
-				return getDiv();
-			case XhtmlPackage.XHTML_DIV_TYPE__PRE:
-				return getPre();
-			case XhtmlPackage.XHTML_DIV_TYPE__BLOCKQUOTE:
-				return getBlockquote();
-			case XhtmlPackage.XHTML_DIV_TYPE__ADDRESS:
-				return getAddress();
-			case XhtmlPackage.XHTML_DIV_TYPE__HR:
-				return getHr();
-			case XhtmlPackage.XHTML_DIV_TYPE__TABLE:
-				return getTable();
-			case XhtmlPackage.XHTML_DIV_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_DIV_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_DIV_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_DIV_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_DIV_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_DIV_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_DIV_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_DIV_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_DIV_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_DIV_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_DIV_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_DIV_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_DIV_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_DIV_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_DIV_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_DIV_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_DIV_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_DIV_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_DIV_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_DIV_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_DIV_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_DIV_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_DIV_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_DIV_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_DIV_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_DIV_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_DIV_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_DIV_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_DIV_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_DIV_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_DIV_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_DIV_TYPE__XHTML_FLOW_MIX:
+			if (coreType)
+				return getXhtmlFlowMix();
+			return ((FeatureMap.Internal) getXhtmlFlowMix()).getWrapper();
+		case XhtmlPackage.XHTML_DIV_TYPE__H1:
+			return getH1();
+		case XhtmlPackage.XHTML_DIV_TYPE__H2:
+			return getH2();
+		case XhtmlPackage.XHTML_DIV_TYPE__H3:
+			return getH3();
+		case XhtmlPackage.XHTML_DIV_TYPE__H4:
+			return getH4();
+		case XhtmlPackage.XHTML_DIV_TYPE__H5:
+			return getH5();
+		case XhtmlPackage.XHTML_DIV_TYPE__H6:
+			return getH6();
+		case XhtmlPackage.XHTML_DIV_TYPE__UL:
+			return getUl();
+		case XhtmlPackage.XHTML_DIV_TYPE__OL:
+			return getOl();
+		case XhtmlPackage.XHTML_DIV_TYPE__DL:
+			return getDl();
+		case XhtmlPackage.XHTML_DIV_TYPE__P:
+			return getP();
+		case XhtmlPackage.XHTML_DIV_TYPE__DIV:
+			return getDiv();
+		case XhtmlPackage.XHTML_DIV_TYPE__PRE:
+			return getPre();
+		case XhtmlPackage.XHTML_DIV_TYPE__BLOCKQUOTE:
+			return getBlockquote();
+		case XhtmlPackage.XHTML_DIV_TYPE__ADDRESS:
+			return getAddress();
+		case XhtmlPackage.XHTML_DIV_TYPE__HR:
+			return getHr();
+		case XhtmlPackage.XHTML_DIV_TYPE__TABLE:
+			return getTable();
+		case XhtmlPackage.XHTML_DIV_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_DIV_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_DIV_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_DIV_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_DIV_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_DIV_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_DIV_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_DIV_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_DIV_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_DIV_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_DIV_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_DIV_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_DIV_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_DIV_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_DIV_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_DIV_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_DIV_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_DIV_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_DIV_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_DIV_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_DIV_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_DIV_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_DIV_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_DIV_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_DIV_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_DIV_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_DIV_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_DIV_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_DIV_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_DIV_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DIV_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__XHTML_FLOW_MIX:
-				((FeatureMap.Internal)getXhtmlFlowMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__H1:
-				getH1().clear();
-				getH1().addAll((Collection<? extends XhtmlH1Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__H2:
-				getH2().clear();
-				getH2().addAll((Collection<? extends XhtmlH2Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__H3:
-				getH3().clear();
-				getH3().addAll((Collection<? extends XhtmlH3Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__H4:
-				getH4().clear();
-				getH4().addAll((Collection<? extends XhtmlH4Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__H5:
-				getH5().clear();
-				getH5().addAll((Collection<? extends XhtmlH5Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__H6:
-				getH6().clear();
-				getH6().addAll((Collection<? extends XhtmlH6Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__UL:
-				getUl().clear();
-				getUl().addAll((Collection<? extends XhtmlUlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__OL:
-				getOl().clear();
-				getOl().addAll((Collection<? extends XhtmlOlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__DL:
-				getDl().clear();
-				getDl().addAll((Collection<? extends XhtmlDlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__P:
-				getP().clear();
-				getP().addAll((Collection<? extends XhtmlPType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__DIV:
-				getDiv().clear();
-				getDiv().addAll((Collection<? extends XhtmlDivType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__PRE:
-				getPre().clear();
-				getPre().addAll((Collection<? extends XhtmlPreType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__BLOCKQUOTE:
-				getBlockquote().clear();
-				getBlockquote().addAll((Collection<? extends XhtmlBlockquoteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__ADDRESS:
-				getAddress().clear();
-				getAddress().addAll((Collection<? extends XhtmlAddressType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__HR:
-				getHr().clear();
-				getHr().addAll((Collection<? extends XhtmlHrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__TABLE:
-				getTable().clear();
-				getTable().addAll((Collection<? extends XhtmlTableType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_DIV_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__XHTML_FLOW_MIX:
+			((FeatureMap.Internal) getXhtmlFlowMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__H1:
+			getH1().clear();
+			getH1().addAll((Collection<? extends XhtmlH1Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__H2:
+			getH2().clear();
+			getH2().addAll((Collection<? extends XhtmlH2Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__H3:
+			getH3().clear();
+			getH3().addAll((Collection<? extends XhtmlH3Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__H4:
+			getH4().clear();
+			getH4().addAll((Collection<? extends XhtmlH4Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__H5:
+			getH5().clear();
+			getH5().addAll((Collection<? extends XhtmlH5Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__H6:
+			getH6().clear();
+			getH6().addAll((Collection<? extends XhtmlH6Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__UL:
+			getUl().clear();
+			getUl().addAll((Collection<? extends XhtmlUlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__OL:
+			getOl().clear();
+			getOl().addAll((Collection<? extends XhtmlOlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__DL:
+			getDl().clear();
+			getDl().addAll((Collection<? extends XhtmlDlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__P:
+			getP().clear();
+			getP().addAll((Collection<? extends XhtmlPType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__DIV:
+			getDiv().clear();
+			getDiv().addAll((Collection<? extends XhtmlDivType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__PRE:
+			getPre().clear();
+			getPre().addAll((Collection<? extends XhtmlPreType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__BLOCKQUOTE:
+			getBlockquote().clear();
+			getBlockquote().addAll((Collection<? extends XhtmlBlockquoteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__ADDRESS:
+			getAddress().clear();
+			getAddress().addAll((Collection<? extends XhtmlAddressType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__HR:
+			getHr().clear();
+			getHr().addAll((Collection<? extends XhtmlHrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__TABLE:
+			getTable().clear();
+			getTable().addAll((Collection<? extends XhtmlTableType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DIV_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__XHTML_FLOW_MIX:
-				getXhtmlFlowMix().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__H1:
-				getH1().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__H2:
-				getH2().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__H3:
-				getH3().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__H4:
-				getH4().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__H5:
-				getH5().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__H6:
-				getH6().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__UL:
-				getUl().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__OL:
-				getOl().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__DL:
-				getDl().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__P:
-				getP().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__DIV:
-				getDiv().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__PRE:
-				getPre().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__BLOCKQUOTE:
-				getBlockquote().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__ADDRESS:
-				getAddress().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__HR:
-				getHr().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__TABLE:
-				getTable().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DIV_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_DIV_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__XHTML_FLOW_MIX:
+			getXhtmlFlowMix().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__H1:
+			getH1().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__H2:
+			getH2().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__H3:
+			getH3().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__H4:
+			getH4().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__H5:
+			getH5().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__H6:
+			getH6().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__UL:
+			getUl().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__OL:
+			getOl().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__DL:
+			getDl().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__P:
+			getP().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__DIV:
+			getDiv().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__PRE:
+			getPre().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__BLOCKQUOTE:
+			getBlockquote().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__ADDRESS:
+			getAddress().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__HR:
+			getHr().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__TABLE:
+			getTable().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DIV_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DIV_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__XHTML_FLOW_MIX:
-				return !getXhtmlFlowMix().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__H1:
-				return !getH1().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__H2:
-				return !getH2().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__H3:
-				return !getH3().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__H4:
-				return !getH4().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__H5:
-				return !getH5().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__H6:
-				return !getH6().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__UL:
-				return !getUl().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__OL:
-				return !getOl().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__DL:
-				return !getDl().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__P:
-				return !getP().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__DIV:
-				return !getDiv().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__PRE:
-				return !getPre().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__BLOCKQUOTE:
-				return !getBlockquote().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__ADDRESS:
-				return !getAddress().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__HR:
-				return !getHr().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__TABLE:
-				return !getTable().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_DIV_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_DIV_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_DIV_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_DIV_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_DIV_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_DIV_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_DIV_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__XHTML_FLOW_MIX:
+			return !getXhtmlFlowMix().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__H1:
+			return !getH1().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__H2:
+			return !getH2().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__H3:
+			return !getH3().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__H4:
+			return !getH4().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__H5:
+			return !getH5().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__H6:
+			return !getH6().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__UL:
+			return !getUl().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__OL:
+			return !getOl().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__DL:
+			return !getDl().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__P:
+			return !getP().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__DIV:
+			return !getDiv().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__PRE:
+			return !getPre().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__BLOCKQUOTE:
+			return !getBlockquote().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__ADDRESS:
+			return !getAddress().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__HR:
+			return !getHr().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__TABLE:
+			return !getTable().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_DIV_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_DIV_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_DIV_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_DIV_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_DIV_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_DIV_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlDivTypeImpl
+} // XhtmlDivTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDlTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDlTypeImpl.java
index 2ac058f..144b685 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDlTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDlTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,52 +15,44 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlDdType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlDlType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlDtType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Dl Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Dl Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getDt <em>Dt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getDd <em>Dd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getGroup <em>Group</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getDt <em>Dt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getDd <em>Dd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDlTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlDlTypeImpl extends EObjectImpl implements XhtmlDlType {
+public class XhtmlDlTypeImpl extends MinimalEObjectImpl implements XhtmlDlType {
 	/**
-	 * The cached value of the '{@link #getGroup() <em>Group</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getGroup() <em>Group</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getGroup()
 	 * @generated
 	 * @ordered
@@ -68,9 +60,9 @@
 	protected FeatureMap group;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -78,9 +70,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -88,9 +80,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -98,9 +89,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -108,9 +98,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -118,9 +108,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -128,9 +118,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -138,9 +128,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -148,18 +138,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -167,9 +156,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -177,9 +166,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -187,9 +176,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -197,8 +186,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlDlTypeImpl() {
@@ -206,8 +195,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -216,8 +205,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getGroup() {
@@ -228,8 +217,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDtType> getDt() {
@@ -237,8 +226,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDdType> getDd() {
@@ -246,8 +235,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -255,8 +244,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -267,8 +256,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -276,8 +265,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -288,8 +277,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -297,8 +286,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -309,8 +298,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -318,8 +307,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -332,8 +321,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -346,8 +335,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -355,8 +344,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -364,8 +353,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -376,8 +365,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -385,8 +374,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -397,191 +386,196 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DL_TYPE__GROUP:
-				return ((InternalEList<?>)getGroup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DL_TYPE__DT:
-				return ((InternalEList<?>)getDt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DL_TYPE__DD:
-				return ((InternalEList<?>)getDd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DL_TYPE__GROUP:
+			return ((InternalEList<?>) getGroup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DL_TYPE__DT:
+			return ((InternalEList<?>) getDt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DL_TYPE__DD:
+			return ((InternalEList<?>) getDd()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DL_TYPE__GROUP:
-				if (coreType) return getGroup();
-				return ((FeatureMap.Internal)getGroup()).getWrapper();
-			case XhtmlPackage.XHTML_DL_TYPE__DT:
-				return getDt();
-			case XhtmlPackage.XHTML_DL_TYPE__DD:
-				return getDd();
-			case XhtmlPackage.XHTML_DL_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_DL_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_DL_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_DL_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_DL_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_DL_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_DL_TYPE__GROUP:
+			if (coreType)
+				return getGroup();
+			return ((FeatureMap.Internal) getGroup()).getWrapper();
+		case XhtmlPackage.XHTML_DL_TYPE__DT:
+			return getDt();
+		case XhtmlPackage.XHTML_DL_TYPE__DD:
+			return getDd();
+		case XhtmlPackage.XHTML_DL_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_DL_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_DL_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_DL_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_DL_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_DL_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DL_TYPE__GROUP:
-				((FeatureMap.Internal)getGroup()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__DT:
-				getDt().clear();
-				getDt().addAll((Collection<? extends XhtmlDtType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__DD:
-				getDd().clear();
-				getDd().addAll((Collection<? extends XhtmlDdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_DL_TYPE__GROUP:
+			((FeatureMap.Internal) getGroup()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__DT:
+			getDt().clear();
+			getDt().addAll((Collection<? extends XhtmlDtType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__DD:
+			getDd().clear();
+			getDd().addAll((Collection<? extends XhtmlDdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DL_TYPE__GROUP:
-				getGroup().clear();
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__DT:
-				getDt().clear();
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__DD:
-				getDd().clear();
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DL_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_DL_TYPE__GROUP:
+			getGroup().clear();
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__DT:
+			getDt().clear();
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__DD:
+			getDd().clear();
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DL_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DL_TYPE__GROUP:
-				return group != null && !group.isEmpty();
-			case XhtmlPackage.XHTML_DL_TYPE__DT:
-				return !getDt().isEmpty();
-			case XhtmlPackage.XHTML_DL_TYPE__DD:
-				return !getDd().isEmpty();
-			case XhtmlPackage.XHTML_DL_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_DL_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_DL_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_DL_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_DL_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_DL_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_DL_TYPE__GROUP:
+			return group != null && !group.isEmpty();
+		case XhtmlPackage.XHTML_DL_TYPE__DT:
+			return !getDt().isEmpty();
+		case XhtmlPackage.XHTML_DL_TYPE__DD:
+			return !getDd().isEmpty();
+		case XhtmlPackage.XHTML_DL_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_DL_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_DL_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_DL_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_DL_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_DL_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group: ");
+		result.append(" (group: "); //$NON-NLS-1$
 		result.append(group);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlDlTypeImpl
+} // XhtmlDlTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDtTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDtTypeImpl.java
index b54c668..e5a098d 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDtTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlDtTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -51,54 +45,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Dt Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Dt Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlDtTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlDtTypeImpl extends EObjectImpl implements XhtmlDtType {
+public class XhtmlDtTypeImpl extends MinimalEObjectImpl implements XhtmlDtType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -106,9 +98,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -116,9 +108,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -126,9 +118,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -136,9 +127,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -146,9 +136,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -156,9 +146,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -166,9 +156,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -176,9 +166,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -186,18 +176,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -205,9 +194,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -215,9 +204,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -225,9 +214,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -235,8 +224,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlDtTypeImpl() {
@@ -244,8 +233,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -254,8 +243,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -266,17 +255,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlDtType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlDtType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -284,8 +273,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -293,8 +282,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -302,8 +291,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -311,8 +300,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -320,8 +309,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -329,8 +318,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -338,8 +327,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -347,8 +336,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -356,8 +345,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -365,8 +354,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -374,8 +363,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -383,8 +372,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -392,8 +381,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -401,8 +390,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -410,8 +399,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -419,8 +408,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -428,8 +417,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -437,8 +426,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -446,8 +435,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -455,8 +444,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -464,8 +453,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -473,8 +462,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -482,8 +471,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -491,8 +480,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -500,8 +489,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -512,8 +501,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -521,8 +510,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -533,8 +522,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -542,8 +531,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -554,8 +543,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -563,8 +552,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -577,8 +566,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -591,8 +580,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -600,8 +589,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -609,8 +598,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -621,8 +610,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -630,8 +619,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -642,490 +631,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DT_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_DT_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_DT_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DT_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_DT_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_DT_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_DT_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_DT_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_DT_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_DT_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_DT_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_DT_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_DT_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_DT_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_DT_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_DT_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_DT_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_DT_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_DT_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_DT_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_DT_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_DT_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_DT_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_DT_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_DT_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_DT_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_DT_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_DT_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_DT_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_DT_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_DT_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_DT_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_DT_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_DT_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_DT_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_DT_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_DT_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_DT_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_DT_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_DT_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_DT_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_DT_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_DT_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_DT_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_DT_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_DT_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_DT_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_DT_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_DT_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_DT_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_DT_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_DT_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_DT_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_DT_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_DT_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_DT_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_DT_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_DT_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_DT_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_DT_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_DT_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_DT_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_DT_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_DT_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_DT_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_DT_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_DT_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DT_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_DT_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DT_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_DT_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_DT_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_DT_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_DT_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_DT_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_DT_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_DT_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_DT_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_DT_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_DT_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_DT_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_DT_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_DT_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_DT_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_DT_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_DT_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_DT_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlDtTypeImpl
+} // XhtmlDtTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlEditTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlEditTypeImpl.java
index 48eecf2..d5a6e40 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlEditTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlEditTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,21 +17,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -68,72 +62,70 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Edit Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Edit Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getH1 <em>H1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getH2 <em>H2</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getH3 <em>H3</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getH4 <em>H4</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getH5 <em>H5</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getH6 <em>H6</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getUl <em>Ul</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getOl <em>Ol</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getDl <em>Dl</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getPre <em>Pre</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getBlockquote <em>Blockquote</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getHr <em>Hr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getCite1 <em>Cite1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getDatetime <em>Datetime</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getH1 <em>H1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getH2 <em>H2</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getH3 <em>H3</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getH4 <em>H4</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getH5 <em>H5</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getH6 <em>H6</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getUl <em>Ul</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getOl <em>Ol</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getDl <em>Dl</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getPre <em>Pre</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getBlockquote <em>Blockquote</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getAddress <em>Address</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getHr <em>Hr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getCite1 <em>Cite1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getDatetime <em>Datetime</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEditTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlEditTypeImpl extends EObjectImpl implements XhtmlEditType {
+public class XhtmlEditTypeImpl extends MinimalEObjectImpl implements XhtmlEditType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -141,9 +133,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getCite1() <em>Cite1</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCite1() <em>Cite1</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCite1()
 	 * @generated
 	 * @ordered
@@ -151,9 +143,9 @@
 	protected static final String CITE1_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCite1() <em>Cite1</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCite1() <em>Cite1</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getCite1()
 	 * @generated
 	 * @ordered
@@ -161,9 +153,9 @@
 	protected String cite1 = CITE1_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -171,9 +163,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -181,9 +173,9 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDatetime() <em>Datetime</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getDatetime() <em>Datetime</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getDatetime()
 	 * @generated
 	 * @ordered
@@ -191,9 +183,9 @@
 	protected static final XMLGregorianCalendar DATETIME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getDatetime() <em>Datetime</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDatetime() <em>Datetime</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getDatetime()
 	 * @generated
 	 * @ordered
@@ -201,9 +193,8 @@
 	protected XMLGregorianCalendar datetime = DATETIME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -211,9 +202,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -221,9 +211,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -231,9 +221,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -241,9 +231,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -251,9 +241,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -261,18 +251,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -280,9 +269,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -290,9 +279,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -300,9 +289,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -310,8 +299,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlEditTypeImpl() {
@@ -319,8 +308,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -329,8 +318,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -341,17 +330,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlFlowMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlEditType_XhtmlFlowMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlEditType_XhtmlFlowMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH1Type> getH1() {
@@ -359,8 +348,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH2Type> getH2() {
@@ -368,8 +357,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH3Type> getH3() {
@@ -377,8 +366,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH4Type> getH4() {
@@ -386,8 +375,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH5Type> getH5() {
@@ -395,8 +384,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH6Type> getH6() {
@@ -404,8 +393,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlUlType> getUl() {
@@ -413,8 +402,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlOlType> getOl() {
@@ -422,8 +411,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDlType> getDl() {
@@ -431,8 +420,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlPType> getP() {
@@ -440,8 +429,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDivType> getDiv() {
@@ -449,8 +438,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlPreType> getPre() {
@@ -458,8 +447,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBlockquoteType> getBlockquote() {
@@ -467,8 +456,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAddressType> getAddress() {
@@ -476,8 +465,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlHrType> getHr() {
@@ -485,8 +474,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlTableType> getTable() {
@@ -494,8 +483,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -503,8 +492,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -512,8 +501,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -521,8 +510,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -530,8 +519,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -539,8 +528,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -548,8 +537,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -557,8 +546,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -566,8 +555,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -575,8 +564,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -584,8 +573,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -593,8 +582,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -602,8 +591,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -611,8 +600,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -620,8 +609,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -629,8 +618,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -638,8 +627,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -647,8 +636,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -656,8 +645,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -665,8 +654,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -674,8 +663,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -683,8 +672,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -692,8 +681,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -701,8 +690,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -710,8 +699,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getCite1() {
@@ -719,8 +708,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCite1(String newCite1) {
@@ -731,8 +720,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -740,8 +729,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -752,8 +741,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XMLGregorianCalendar getDatetime() {
@@ -761,8 +750,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDatetime(XMLGregorianCalendar newDatetime) {
@@ -773,8 +762,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -782,8 +771,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -794,8 +783,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -803,8 +792,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -815,8 +804,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -824,8 +813,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -838,8 +827,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -852,8 +841,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -861,8 +850,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -870,8 +859,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -882,8 +871,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -891,8 +880,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -903,722 +892,728 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_EDIT_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__XHTML_FLOW_MIX:
-				return ((InternalEList<?>)getXhtmlFlowMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__H1:
-				return ((InternalEList<?>)getH1()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__H2:
-				return ((InternalEList<?>)getH2()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__H3:
-				return ((InternalEList<?>)getH3()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__H4:
-				return ((InternalEList<?>)getH4()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__H5:
-				return ((InternalEList<?>)getH5()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__H6:
-				return ((InternalEList<?>)getH6()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__UL:
-				return ((InternalEList<?>)getUl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__OL:
-				return ((InternalEList<?>)getOl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__DL:
-				return ((InternalEList<?>)getDl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__P:
-				return ((InternalEList<?>)getP()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__DIV:
-				return ((InternalEList<?>)getDiv()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__PRE:
-				return ((InternalEList<?>)getPre()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__BLOCKQUOTE:
-				return ((InternalEList<?>)getBlockquote()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__ADDRESS:
-				return ((InternalEList<?>)getAddress()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__HR:
-				return ((InternalEList<?>)getHr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__TABLE:
-				return ((InternalEList<?>)getTable()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EDIT_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__XHTML_FLOW_MIX:
+			return ((InternalEList<?>) getXhtmlFlowMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__H1:
+			return ((InternalEList<?>) getH1()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__H2:
+			return ((InternalEList<?>) getH2()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__H3:
+			return ((InternalEList<?>) getH3()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__H4:
+			return ((InternalEList<?>) getH4()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__H5:
+			return ((InternalEList<?>) getH5()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__H6:
+			return ((InternalEList<?>) getH6()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__UL:
+			return ((InternalEList<?>) getUl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__OL:
+			return ((InternalEList<?>) getOl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__DL:
+			return ((InternalEList<?>) getDl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__P:
+			return ((InternalEList<?>) getP()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__DIV:
+			return ((InternalEList<?>) getDiv()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__PRE:
+			return ((InternalEList<?>) getPre()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__BLOCKQUOTE:
+			return ((InternalEList<?>) getBlockquote()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__ADDRESS:
+			return ((InternalEList<?>) getAddress()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__HR:
+			return ((InternalEList<?>) getHr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__TABLE:
+			return ((InternalEList<?>) getTable()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EDIT_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_EDIT_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_EDIT_TYPE__XHTML_FLOW_MIX:
-				if (coreType) return getXhtmlFlowMix();
-				return ((FeatureMap.Internal)getXhtmlFlowMix()).getWrapper();
-			case XhtmlPackage.XHTML_EDIT_TYPE__H1:
-				return getH1();
-			case XhtmlPackage.XHTML_EDIT_TYPE__H2:
-				return getH2();
-			case XhtmlPackage.XHTML_EDIT_TYPE__H3:
-				return getH3();
-			case XhtmlPackage.XHTML_EDIT_TYPE__H4:
-				return getH4();
-			case XhtmlPackage.XHTML_EDIT_TYPE__H5:
-				return getH5();
-			case XhtmlPackage.XHTML_EDIT_TYPE__H6:
-				return getH6();
-			case XhtmlPackage.XHTML_EDIT_TYPE__UL:
-				return getUl();
-			case XhtmlPackage.XHTML_EDIT_TYPE__OL:
-				return getOl();
-			case XhtmlPackage.XHTML_EDIT_TYPE__DL:
-				return getDl();
-			case XhtmlPackage.XHTML_EDIT_TYPE__P:
-				return getP();
-			case XhtmlPackage.XHTML_EDIT_TYPE__DIV:
-				return getDiv();
-			case XhtmlPackage.XHTML_EDIT_TYPE__PRE:
-				return getPre();
-			case XhtmlPackage.XHTML_EDIT_TYPE__BLOCKQUOTE:
-				return getBlockquote();
-			case XhtmlPackage.XHTML_EDIT_TYPE__ADDRESS:
-				return getAddress();
-			case XhtmlPackage.XHTML_EDIT_TYPE__HR:
-				return getHr();
-			case XhtmlPackage.XHTML_EDIT_TYPE__TABLE:
-				return getTable();
-			case XhtmlPackage.XHTML_EDIT_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_EDIT_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_EDIT_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_EDIT_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_EDIT_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_EDIT_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_EDIT_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_EDIT_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_EDIT_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_EDIT_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_EDIT_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_EDIT_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_EDIT_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_EDIT_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_EDIT_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_EDIT_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_EDIT_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_EDIT_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_EDIT_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_EDIT_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_EDIT_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_EDIT_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_EDIT_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_EDIT_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_EDIT_TYPE__CITE1:
-				return getCite1();
-			case XhtmlPackage.XHTML_EDIT_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_EDIT_TYPE__DATETIME:
-				return getDatetime();
-			case XhtmlPackage.XHTML_EDIT_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_EDIT_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_EDIT_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_EDIT_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_EDIT_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_EDIT_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_EDIT_TYPE__XHTML_FLOW_MIX:
+			if (coreType)
+				return getXhtmlFlowMix();
+			return ((FeatureMap.Internal) getXhtmlFlowMix()).getWrapper();
+		case XhtmlPackage.XHTML_EDIT_TYPE__H1:
+			return getH1();
+		case XhtmlPackage.XHTML_EDIT_TYPE__H2:
+			return getH2();
+		case XhtmlPackage.XHTML_EDIT_TYPE__H3:
+			return getH3();
+		case XhtmlPackage.XHTML_EDIT_TYPE__H4:
+			return getH4();
+		case XhtmlPackage.XHTML_EDIT_TYPE__H5:
+			return getH5();
+		case XhtmlPackage.XHTML_EDIT_TYPE__H6:
+			return getH6();
+		case XhtmlPackage.XHTML_EDIT_TYPE__UL:
+			return getUl();
+		case XhtmlPackage.XHTML_EDIT_TYPE__OL:
+			return getOl();
+		case XhtmlPackage.XHTML_EDIT_TYPE__DL:
+			return getDl();
+		case XhtmlPackage.XHTML_EDIT_TYPE__P:
+			return getP();
+		case XhtmlPackage.XHTML_EDIT_TYPE__DIV:
+			return getDiv();
+		case XhtmlPackage.XHTML_EDIT_TYPE__PRE:
+			return getPre();
+		case XhtmlPackage.XHTML_EDIT_TYPE__BLOCKQUOTE:
+			return getBlockquote();
+		case XhtmlPackage.XHTML_EDIT_TYPE__ADDRESS:
+			return getAddress();
+		case XhtmlPackage.XHTML_EDIT_TYPE__HR:
+			return getHr();
+		case XhtmlPackage.XHTML_EDIT_TYPE__TABLE:
+			return getTable();
+		case XhtmlPackage.XHTML_EDIT_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_EDIT_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_EDIT_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_EDIT_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_EDIT_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_EDIT_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_EDIT_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_EDIT_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_EDIT_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_EDIT_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_EDIT_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_EDIT_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_EDIT_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_EDIT_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_EDIT_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_EDIT_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_EDIT_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_EDIT_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_EDIT_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_EDIT_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_EDIT_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_EDIT_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_EDIT_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_EDIT_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_EDIT_TYPE__CITE1:
+			return getCite1();
+		case XhtmlPackage.XHTML_EDIT_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_EDIT_TYPE__DATETIME:
+			return getDatetime();
+		case XhtmlPackage.XHTML_EDIT_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_EDIT_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_EDIT_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_EDIT_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_EDIT_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_EDIT_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__XHTML_FLOW_MIX:
-				((FeatureMap.Internal)getXhtmlFlowMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__H1:
-				getH1().clear();
-				getH1().addAll((Collection<? extends XhtmlH1Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__H2:
-				getH2().clear();
-				getH2().addAll((Collection<? extends XhtmlH2Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__H3:
-				getH3().clear();
-				getH3().addAll((Collection<? extends XhtmlH3Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__H4:
-				getH4().clear();
-				getH4().addAll((Collection<? extends XhtmlH4Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__H5:
-				getH5().clear();
-				getH5().addAll((Collection<? extends XhtmlH5Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__H6:
-				getH6().clear();
-				getH6().addAll((Collection<? extends XhtmlH6Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__UL:
-				getUl().clear();
-				getUl().addAll((Collection<? extends XhtmlUlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__OL:
-				getOl().clear();
-				getOl().addAll((Collection<? extends XhtmlOlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__DL:
-				getDl().clear();
-				getDl().addAll((Collection<? extends XhtmlDlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__P:
-				getP().clear();
-				getP().addAll((Collection<? extends XhtmlPType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__DIV:
-				getDiv().clear();
-				getDiv().addAll((Collection<? extends XhtmlDivType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__PRE:
-				getPre().clear();
-				getPre().addAll((Collection<? extends XhtmlPreType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__BLOCKQUOTE:
-				getBlockquote().clear();
-				getBlockquote().addAll((Collection<? extends XhtmlBlockquoteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__ADDRESS:
-				getAddress().clear();
-				getAddress().addAll((Collection<? extends XhtmlAddressType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__HR:
-				getHr().clear();
-				getHr().addAll((Collection<? extends XhtmlHrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__TABLE:
-				getTable().clear();
-				getTable().addAll((Collection<? extends XhtmlTableType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__CITE1:
-				setCite1((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__DATETIME:
-				setDatetime((XMLGregorianCalendar)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__XHTML_FLOW_MIX:
+			((FeatureMap.Internal) getXhtmlFlowMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__H1:
+			getH1().clear();
+			getH1().addAll((Collection<? extends XhtmlH1Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__H2:
+			getH2().clear();
+			getH2().addAll((Collection<? extends XhtmlH2Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__H3:
+			getH3().clear();
+			getH3().addAll((Collection<? extends XhtmlH3Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__H4:
+			getH4().clear();
+			getH4().addAll((Collection<? extends XhtmlH4Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__H5:
+			getH5().clear();
+			getH5().addAll((Collection<? extends XhtmlH5Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__H6:
+			getH6().clear();
+			getH6().addAll((Collection<? extends XhtmlH6Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__UL:
+			getUl().clear();
+			getUl().addAll((Collection<? extends XhtmlUlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__OL:
+			getOl().clear();
+			getOl().addAll((Collection<? extends XhtmlOlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__DL:
+			getDl().clear();
+			getDl().addAll((Collection<? extends XhtmlDlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__P:
+			getP().clear();
+			getP().addAll((Collection<? extends XhtmlPType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__DIV:
+			getDiv().clear();
+			getDiv().addAll((Collection<? extends XhtmlDivType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__PRE:
+			getPre().clear();
+			getPre().addAll((Collection<? extends XhtmlPreType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__BLOCKQUOTE:
+			getBlockquote().clear();
+			getBlockquote().addAll((Collection<? extends XhtmlBlockquoteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__ADDRESS:
+			getAddress().clear();
+			getAddress().addAll((Collection<? extends XhtmlAddressType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__HR:
+			getHr().clear();
+			getHr().addAll((Collection<? extends XhtmlHrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__TABLE:
+			getTable().clear();
+			getTable().addAll((Collection<? extends XhtmlTableType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__CITE1:
+			setCite1((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__DATETIME:
+			setDatetime((XMLGregorianCalendar) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_EDIT_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__XHTML_FLOW_MIX:
-				getXhtmlFlowMix().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__H1:
-				getH1().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__H2:
-				getH2().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__H3:
-				getH3().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__H4:
-				getH4().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__H5:
-				getH5().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__H6:
-				getH6().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__UL:
-				getUl().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__OL:
-				getOl().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__DL:
-				getDl().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__P:
-				getP().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__DIV:
-				getDiv().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__PRE:
-				getPre().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__BLOCKQUOTE:
-				getBlockquote().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__ADDRESS:
-				getAddress().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__HR:
-				getHr().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__TABLE:
-				getTable().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__CITE1:
-				setCite1(CITE1_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__DATETIME:
-				setDatetime(DATETIME_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_EDIT_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__XHTML_FLOW_MIX:
+			getXhtmlFlowMix().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__H1:
+			getH1().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__H2:
+			getH2().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__H3:
+			getH3().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__H4:
+			getH4().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__H5:
+			getH5().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__H6:
+			getH6().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__UL:
+			getUl().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__OL:
+			getOl().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__DL:
+			getDl().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__P:
+			getP().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__DIV:
+			getDiv().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__PRE:
+			getPre().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__BLOCKQUOTE:
+			getBlockquote().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__ADDRESS:
+			getAddress().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__HR:
+			getHr().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__TABLE:
+			getTable().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__CITE1:
+			setCite1(CITE1_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__DATETIME:
+			setDatetime(DATETIME_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_EDIT_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_EDIT_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__XHTML_FLOW_MIX:
-				return !getXhtmlFlowMix().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__H1:
-				return !getH1().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__H2:
-				return !getH2().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__H3:
-				return !getH3().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__H4:
-				return !getH4().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__H5:
-				return !getH5().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__H6:
-				return !getH6().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__UL:
-				return !getUl().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__OL:
-				return !getOl().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__DL:
-				return !getDl().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__P:
-				return !getP().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__DIV:
-				return !getDiv().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__PRE:
-				return !getPre().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__BLOCKQUOTE:
-				return !getBlockquote().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__ADDRESS:
-				return !getAddress().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__HR:
-				return !getHr().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__TABLE:
-				return !getTable().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_EDIT_TYPE__CITE1:
-				return CITE1_EDEFAULT == null ? cite1 != null : !CITE1_EDEFAULT.equals(cite1);
-			case XhtmlPackage.XHTML_EDIT_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_EDIT_TYPE__DATETIME:
-				return DATETIME_EDEFAULT == null ? datetime != null : !DATETIME_EDEFAULT.equals(datetime);
-			case XhtmlPackage.XHTML_EDIT_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_EDIT_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_EDIT_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_EDIT_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_EDIT_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_EDIT_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__XHTML_FLOW_MIX:
+			return !getXhtmlFlowMix().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__H1:
+			return !getH1().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__H2:
+			return !getH2().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__H3:
+			return !getH3().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__H4:
+			return !getH4().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__H5:
+			return !getH5().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__H6:
+			return !getH6().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__UL:
+			return !getUl().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__OL:
+			return !getOl().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__DL:
+			return !getDl().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__P:
+			return !getP().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__DIV:
+			return !getDiv().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__PRE:
+			return !getPre().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__BLOCKQUOTE:
+			return !getBlockquote().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__ADDRESS:
+			return !getAddress().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__HR:
+			return !getHr().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__TABLE:
+			return !getTable().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_EDIT_TYPE__CITE1:
+			return CITE1_EDEFAULT == null ? cite1 != null : !CITE1_EDEFAULT.equals(cite1);
+		case XhtmlPackage.XHTML_EDIT_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_EDIT_TYPE__DATETIME:
+			return DATETIME_EDEFAULT == null ? datetime != null : !DATETIME_EDEFAULT.equals(datetime);
+		case XhtmlPackage.XHTML_EDIT_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_EDIT_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_EDIT_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_EDIT_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_EDIT_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", cite1: ");
+		result.append(", cite1: "); //$NON-NLS-1$
 		result.append(cite1);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", datetime: ");
+		result.append(", datetime: "); //$NON-NLS-1$
 		result.append(datetime);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlEditTypeImpl
+} // XhtmlEditTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlEmTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlEmTypeImpl.java
index f2032fe..7883c57 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlEmTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlEmTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -50,54 +44,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Em Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Em Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlEmTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlEmTypeImpl extends EObjectImpl implements XhtmlEmType {
+public class XhtmlEmTypeImpl extends MinimalEObjectImpl implements XhtmlEmType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -105,9 +97,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -115,9 +107,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -125,9 +117,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -135,9 +126,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -145,9 +135,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -155,9 +145,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -165,9 +155,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -175,9 +165,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -185,18 +175,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -204,9 +193,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -214,9 +203,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -224,9 +213,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -234,8 +223,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlEmTypeImpl() {
@@ -243,8 +232,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -253,8 +242,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -265,17 +254,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlEmType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlEmType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -283,8 +272,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -292,8 +281,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -301,8 +290,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -310,8 +299,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -319,8 +308,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -328,8 +317,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -337,8 +326,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -346,8 +335,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -355,8 +344,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -364,8 +353,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -373,8 +362,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -382,8 +371,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -391,8 +380,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -400,8 +389,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -409,8 +398,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -418,8 +407,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -427,8 +416,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -436,8 +425,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -445,8 +434,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -454,8 +443,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -463,8 +452,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -472,8 +461,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -481,8 +470,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -490,8 +479,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -499,8 +488,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -511,8 +500,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -520,8 +509,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -532,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -541,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -553,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -562,8 +551,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -576,8 +565,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -590,8 +579,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -599,8 +588,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -608,8 +597,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -620,8 +609,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -629,8 +618,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -641,490 +630,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_EM_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_EM_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_EM_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_EM_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_EM_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_EM_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_EM_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_EM_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_EM_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_EM_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_EM_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_EM_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_EM_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_EM_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_EM_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_EM_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_EM_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_EM_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_EM_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_EM_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_EM_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_EM_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_EM_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_EM_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_EM_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_EM_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_EM_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_EM_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_EM_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_EM_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_EM_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_EM_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_EM_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_EM_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_EM_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_EM_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_EM_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_EM_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_EM_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_EM_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_EM_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_EM_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_EM_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_EM_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_EM_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_EM_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_EM_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_EM_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_EM_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_EM_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_EM_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_EM_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_EM_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_EM_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_EM_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_EM_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_EM_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_EM_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_EM_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_EM_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_EM_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_EM_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_EM_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_EM_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_EM_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_EM_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_EM_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_EM_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_EM_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_EM_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_EM_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_EM_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_EM_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_EM_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_EM_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_EM_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_EM_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_EM_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_EM_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_EM_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_EM_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_EM_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_EM_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_EM_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_EM_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_EM_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_EM_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlEmTypeImpl
+} // XhtmlEmTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlFactoryImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlFactoryImpl.java
index 9ca039f..6496577 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlFactoryImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,43 +15,92 @@
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.rmf.reqif10.xhtml.*;
+import org.eclipse.rmf.reqif10.xhtml.AlignType;
+import org.eclipse.rmf.reqif10.xhtml.DeclareType;
+import org.eclipse.rmf.reqif10.xhtml.DocumentRoot;
+import org.eclipse.rmf.reqif10.xhtml.FrameType;
+import org.eclipse.rmf.reqif10.xhtml.RulesType;
+import org.eclipse.rmf.reqif10.xhtml.ScopeType;
+import org.eclipse.rmf.reqif10.xhtml.ValignType;
+import org.eclipse.rmf.reqif10.xhtml.ValuetypeType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlBrType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlColType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlDdType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlDivType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlDlType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlDtType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlEditType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlEmType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlFactory;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlHrType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlLiType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlOlType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlPType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlParamType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlPreType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlQType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlSampType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTableType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTdType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlThType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTrType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlUlType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class XhtmlFactoryImpl extends EFactoryImpl implements XhtmlFactory {
 	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static XhtmlFactory init() {
 		try {
-			XhtmlFactory theXhtmlFactory = (XhtmlFactory)EPackage.Registry.INSTANCE.getEFactory(XhtmlPackage.eNS_URI);
+			XhtmlFactory theXhtmlFactory = (XhtmlFactory) EPackage.Registry.INSTANCE.getEFactory(XhtmlPackage.eNS_URI);
 			if (theXhtmlFactory != null) {
 				return theXhtmlFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new XhtmlFactoryImpl();
 	}
 
 	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlFactoryImpl() {
@@ -59,151 +108,199 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-			case XhtmlPackage.DOCUMENT_ROOT: return createDocumentRoot();
-			case XhtmlPackage.XHTML_ABBR_TYPE: return createXhtmlAbbrType();
-			case XhtmlPackage.XHTML_ACRONYM_TYPE: return createXhtmlAcronymType();
-			case XhtmlPackage.XHTML_ADDRESS_TYPE: return createXhtmlAddressType();
-			case XhtmlPackage.XHTML_ATYPE: return createXhtmlAType();
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE: return createXhtmlBlockquoteType();
-			case XhtmlPackage.XHTML_BR_TYPE: return createXhtmlBrType();
-			case XhtmlPackage.XHTML_CAPTION_TYPE: return createXhtmlCaptionType();
-			case XhtmlPackage.XHTML_CITE_TYPE: return createXhtmlCiteType();
-			case XhtmlPackage.XHTML_CODE_TYPE: return createXhtmlCodeType();
-			case XhtmlPackage.XHTML_COLGROUP_TYPE: return createXhtmlColgroupType();
-			case XhtmlPackage.XHTML_COL_TYPE: return createXhtmlColType();
-			case XhtmlPackage.XHTML_DD_TYPE: return createXhtmlDdType();
-			case XhtmlPackage.XHTML_DFN_TYPE: return createXhtmlDfnType();
-			case XhtmlPackage.XHTML_DIV_TYPE: return createXhtmlDivType();
-			case XhtmlPackage.XHTML_DL_TYPE: return createXhtmlDlType();
-			case XhtmlPackage.XHTML_DT_TYPE: return createXhtmlDtType();
-			case XhtmlPackage.XHTML_EDIT_TYPE: return createXhtmlEditType();
-			case XhtmlPackage.XHTML_EM_TYPE: return createXhtmlEmType();
-			case XhtmlPackage.XHTML_H1_TYPE: return createXhtmlH1Type();
-			case XhtmlPackage.XHTML_H2_TYPE: return createXhtmlH2Type();
-			case XhtmlPackage.XHTML_H3_TYPE: return createXhtmlH3Type();
-			case XhtmlPackage.XHTML_H4_TYPE: return createXhtmlH4Type();
-			case XhtmlPackage.XHTML_H5_TYPE: return createXhtmlH5Type();
-			case XhtmlPackage.XHTML_H6_TYPE: return createXhtmlH6Type();
-			case XhtmlPackage.XHTML_HEADING_TYPE: return createXhtmlHeadingType();
-			case XhtmlPackage.XHTML_HR_TYPE: return createXhtmlHrType();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE: return createXhtmlInlPresType();
-			case XhtmlPackage.XHTML_KBD_TYPE: return createXhtmlKbdType();
-			case XhtmlPackage.XHTML_LI_TYPE: return createXhtmlLiType();
-			case XhtmlPackage.XHTML_OBJECT_TYPE: return createXhtmlObjectType();
-			case XhtmlPackage.XHTML_OL_TYPE: return createXhtmlOlType();
-			case XhtmlPackage.XHTML_PARAM_TYPE: return createXhtmlParamType();
-			case XhtmlPackage.XHTML_PRE_TYPE: return createXhtmlPreType();
-			case XhtmlPackage.XHTML_PTYPE: return createXhtmlPType();
-			case XhtmlPackage.XHTML_QTYPE: return createXhtmlQType();
-			case XhtmlPackage.XHTML_SAMP_TYPE: return createXhtmlSampType();
-			case XhtmlPackage.XHTML_SPAN_TYPE: return createXhtmlSpanType();
-			case XhtmlPackage.XHTML_STRONG_TYPE: return createXhtmlStrongType();
-			case XhtmlPackage.XHTML_TABLE_TYPE: return createXhtmlTableType();
-			case XhtmlPackage.XHTML_TBODY_TYPE: return createXhtmlTbodyType();
-			case XhtmlPackage.XHTML_TD_TYPE: return createXhtmlTdType();
-			case XhtmlPackage.XHTML_TFOOT_TYPE: return createXhtmlTfootType();
-			case XhtmlPackage.XHTML_THEAD_TYPE: return createXhtmlTheadType();
-			case XhtmlPackage.XHTML_TH_TYPE: return createXhtmlThType();
-			case XhtmlPackage.XHTML_TR_TYPE: return createXhtmlTrType();
-			case XhtmlPackage.XHTML_UL_TYPE: return createXhtmlUlType();
-			case XhtmlPackage.XHTML_VAR_TYPE: return createXhtmlVarType();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		case XhtmlPackage.DOCUMENT_ROOT:
+			return createDocumentRoot();
+		case XhtmlPackage.XHTML_ABBR_TYPE:
+			return createXhtmlAbbrType();
+		case XhtmlPackage.XHTML_ACRONYM_TYPE:
+			return createXhtmlAcronymType();
+		case XhtmlPackage.XHTML_ADDRESS_TYPE:
+			return createXhtmlAddressType();
+		case XhtmlPackage.XHTML_ATYPE:
+			return createXhtmlAType();
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE:
+			return createXhtmlBlockquoteType();
+		case XhtmlPackage.XHTML_BR_TYPE:
+			return createXhtmlBrType();
+		case XhtmlPackage.XHTML_CAPTION_TYPE:
+			return createXhtmlCaptionType();
+		case XhtmlPackage.XHTML_CITE_TYPE:
+			return createXhtmlCiteType();
+		case XhtmlPackage.XHTML_CODE_TYPE:
+			return createXhtmlCodeType();
+		case XhtmlPackage.XHTML_COLGROUP_TYPE:
+			return createXhtmlColgroupType();
+		case XhtmlPackage.XHTML_COL_TYPE:
+			return createXhtmlColType();
+		case XhtmlPackage.XHTML_DD_TYPE:
+			return createXhtmlDdType();
+		case XhtmlPackage.XHTML_DFN_TYPE:
+			return createXhtmlDfnType();
+		case XhtmlPackage.XHTML_DIV_TYPE:
+			return createXhtmlDivType();
+		case XhtmlPackage.XHTML_DL_TYPE:
+			return createXhtmlDlType();
+		case XhtmlPackage.XHTML_DT_TYPE:
+			return createXhtmlDtType();
+		case XhtmlPackage.XHTML_EDIT_TYPE:
+			return createXhtmlEditType();
+		case XhtmlPackage.XHTML_EM_TYPE:
+			return createXhtmlEmType();
+		case XhtmlPackage.XHTML_H1_TYPE:
+			return createXhtmlH1Type();
+		case XhtmlPackage.XHTML_H2_TYPE:
+			return createXhtmlH2Type();
+		case XhtmlPackage.XHTML_H3_TYPE:
+			return createXhtmlH3Type();
+		case XhtmlPackage.XHTML_H4_TYPE:
+			return createXhtmlH4Type();
+		case XhtmlPackage.XHTML_H5_TYPE:
+			return createXhtmlH5Type();
+		case XhtmlPackage.XHTML_H6_TYPE:
+			return createXhtmlH6Type();
+		case XhtmlPackage.XHTML_HEADING_TYPE:
+			return createXhtmlHeadingType();
+		case XhtmlPackage.XHTML_HR_TYPE:
+			return createXhtmlHrType();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE:
+			return createXhtmlInlPresType();
+		case XhtmlPackage.XHTML_KBD_TYPE:
+			return createXhtmlKbdType();
+		case XhtmlPackage.XHTML_LI_TYPE:
+			return createXhtmlLiType();
+		case XhtmlPackage.XHTML_OBJECT_TYPE:
+			return createXhtmlObjectType();
+		case XhtmlPackage.XHTML_OL_TYPE:
+			return createXhtmlOlType();
+		case XhtmlPackage.XHTML_PARAM_TYPE:
+			return createXhtmlParamType();
+		case XhtmlPackage.XHTML_PRE_TYPE:
+			return createXhtmlPreType();
+		case XhtmlPackage.XHTML_PTYPE:
+			return createXhtmlPType();
+		case XhtmlPackage.XHTML_QTYPE:
+			return createXhtmlQType();
+		case XhtmlPackage.XHTML_SAMP_TYPE:
+			return createXhtmlSampType();
+		case XhtmlPackage.XHTML_SPAN_TYPE:
+			return createXhtmlSpanType();
+		case XhtmlPackage.XHTML_STRONG_TYPE:
+			return createXhtmlStrongType();
+		case XhtmlPackage.XHTML_TABLE_TYPE:
+			return createXhtmlTableType();
+		case XhtmlPackage.XHTML_TBODY_TYPE:
+			return createXhtmlTbodyType();
+		case XhtmlPackage.XHTML_TD_TYPE:
+			return createXhtmlTdType();
+		case XhtmlPackage.XHTML_TFOOT_TYPE:
+			return createXhtmlTfootType();
+		case XhtmlPackage.XHTML_THEAD_TYPE:
+			return createXhtmlTheadType();
+		case XhtmlPackage.XHTML_TH_TYPE:
+			return createXhtmlThType();
+		case XhtmlPackage.XHTML_TR_TYPE:
+			return createXhtmlTrType();
+		case XhtmlPackage.XHTML_UL_TYPE:
+			return createXhtmlUlType();
+		case XhtmlPackage.XHTML_VAR_TYPE:
+			return createXhtmlVarType();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
 		switch (eDataType.getClassifierID()) {
-			case XhtmlPackage.ALIGN_TYPE:
-				return createAlignTypeFromString(eDataType, initialValue);
-			case XhtmlPackage.DECLARE_TYPE:
-				return createDeclareTypeFromString(eDataType, initialValue);
-			case XhtmlPackage.FRAME_TYPE:
-				return createFrameTypeFromString(eDataType, initialValue);
-			case XhtmlPackage.RULES_TYPE:
-				return createRulesTypeFromString(eDataType, initialValue);
-			case XhtmlPackage.SCOPE_TYPE:
-				return createScopeTypeFromString(eDataType, initialValue);
-			case XhtmlPackage.VALIGN_TYPE:
-				return createValignTypeFromString(eDataType, initialValue);
-			case XhtmlPackage.VALUETYPE_TYPE:
-				return createValuetypeTypeFromString(eDataType, initialValue);
-			case XhtmlPackage.ALIGN_TYPE_OBJECT:
-				return createAlignTypeObjectFromString(eDataType, initialValue);
-			case XhtmlPackage.DECLARE_TYPE_OBJECT:
-				return createDeclareTypeObjectFromString(eDataType, initialValue);
-			case XhtmlPackage.FRAME_TYPE_OBJECT:
-				return createFrameTypeObjectFromString(eDataType, initialValue);
-			case XhtmlPackage.RULES_TYPE_OBJECT:
-				return createRulesTypeObjectFromString(eDataType, initialValue);
-			case XhtmlPackage.SCOPE_TYPE_OBJECT:
-				return createScopeTypeObjectFromString(eDataType, initialValue);
-			case XhtmlPackage.VALIGN_TYPE_OBJECT:
-				return createValignTypeObjectFromString(eDataType, initialValue);
-			case XhtmlPackage.VALUETYPE_TYPE_OBJECT:
-				return createValuetypeTypeObjectFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		case XhtmlPackage.ALIGN_TYPE:
+			return createAlignTypeFromString(eDataType, initialValue);
+		case XhtmlPackage.DECLARE_TYPE:
+			return createDeclareTypeFromString(eDataType, initialValue);
+		case XhtmlPackage.FRAME_TYPE:
+			return createFrameTypeFromString(eDataType, initialValue);
+		case XhtmlPackage.RULES_TYPE:
+			return createRulesTypeFromString(eDataType, initialValue);
+		case XhtmlPackage.SCOPE_TYPE:
+			return createScopeTypeFromString(eDataType, initialValue);
+		case XhtmlPackage.VALIGN_TYPE:
+			return createValignTypeFromString(eDataType, initialValue);
+		case XhtmlPackage.VALUETYPE_TYPE:
+			return createValuetypeTypeFromString(eDataType, initialValue);
+		case XhtmlPackage.ALIGN_TYPE_OBJECT:
+			return createAlignTypeObjectFromString(eDataType, initialValue);
+		case XhtmlPackage.DECLARE_TYPE_OBJECT:
+			return createDeclareTypeObjectFromString(eDataType, initialValue);
+		case XhtmlPackage.FRAME_TYPE_OBJECT:
+			return createFrameTypeObjectFromString(eDataType, initialValue);
+		case XhtmlPackage.RULES_TYPE_OBJECT:
+			return createRulesTypeObjectFromString(eDataType, initialValue);
+		case XhtmlPackage.SCOPE_TYPE_OBJECT:
+			return createScopeTypeObjectFromString(eDataType, initialValue);
+		case XhtmlPackage.VALIGN_TYPE_OBJECT:
+			return createValignTypeObjectFromString(eDataType, initialValue);
+		case XhtmlPackage.VALUETYPE_TYPE_OBJECT:
+			return createValuetypeTypeObjectFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
 		switch (eDataType.getClassifierID()) {
-			case XhtmlPackage.ALIGN_TYPE:
-				return convertAlignTypeToString(eDataType, instanceValue);
-			case XhtmlPackage.DECLARE_TYPE:
-				return convertDeclareTypeToString(eDataType, instanceValue);
-			case XhtmlPackage.FRAME_TYPE:
-				return convertFrameTypeToString(eDataType, instanceValue);
-			case XhtmlPackage.RULES_TYPE:
-				return convertRulesTypeToString(eDataType, instanceValue);
-			case XhtmlPackage.SCOPE_TYPE:
-				return convertScopeTypeToString(eDataType, instanceValue);
-			case XhtmlPackage.VALIGN_TYPE:
-				return convertValignTypeToString(eDataType, instanceValue);
-			case XhtmlPackage.VALUETYPE_TYPE:
-				return convertValuetypeTypeToString(eDataType, instanceValue);
-			case XhtmlPackage.ALIGN_TYPE_OBJECT:
-				return convertAlignTypeObjectToString(eDataType, instanceValue);
-			case XhtmlPackage.DECLARE_TYPE_OBJECT:
-				return convertDeclareTypeObjectToString(eDataType, instanceValue);
-			case XhtmlPackage.FRAME_TYPE_OBJECT:
-				return convertFrameTypeObjectToString(eDataType, instanceValue);
-			case XhtmlPackage.RULES_TYPE_OBJECT:
-				return convertRulesTypeObjectToString(eDataType, instanceValue);
-			case XhtmlPackage.SCOPE_TYPE_OBJECT:
-				return convertScopeTypeObjectToString(eDataType, instanceValue);
-			case XhtmlPackage.VALIGN_TYPE_OBJECT:
-				return convertValignTypeObjectToString(eDataType, instanceValue);
-			case XhtmlPackage.VALUETYPE_TYPE_OBJECT:
-				return convertValuetypeTypeObjectToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		case XhtmlPackage.ALIGN_TYPE:
+			return convertAlignTypeToString(eDataType, instanceValue);
+		case XhtmlPackage.DECLARE_TYPE:
+			return convertDeclareTypeToString(eDataType, instanceValue);
+		case XhtmlPackage.FRAME_TYPE:
+			return convertFrameTypeToString(eDataType, instanceValue);
+		case XhtmlPackage.RULES_TYPE:
+			return convertRulesTypeToString(eDataType, instanceValue);
+		case XhtmlPackage.SCOPE_TYPE:
+			return convertScopeTypeToString(eDataType, instanceValue);
+		case XhtmlPackage.VALIGN_TYPE:
+			return convertValignTypeToString(eDataType, instanceValue);
+		case XhtmlPackage.VALUETYPE_TYPE:
+			return convertValuetypeTypeToString(eDataType, instanceValue);
+		case XhtmlPackage.ALIGN_TYPE_OBJECT:
+			return convertAlignTypeObjectToString(eDataType, instanceValue);
+		case XhtmlPackage.DECLARE_TYPE_OBJECT:
+			return convertDeclareTypeObjectToString(eDataType, instanceValue);
+		case XhtmlPackage.FRAME_TYPE_OBJECT:
+			return convertFrameTypeObjectToString(eDataType, instanceValue);
+		case XhtmlPackage.RULES_TYPE_OBJECT:
+			return convertRulesTypeObjectToString(eDataType, instanceValue);
+		case XhtmlPackage.SCOPE_TYPE_OBJECT:
+			return convertScopeTypeObjectToString(eDataType, instanceValue);
+		case XhtmlPackage.VALIGN_TYPE_OBJECT:
+			return convertValignTypeObjectToString(eDataType, instanceValue);
+		case XhtmlPackage.VALUETYPE_TYPE_OBJECT:
+			return convertValuetypeTypeObjectToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DocumentRoot createDocumentRoot() {
@@ -212,8 +309,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlAbbrType createXhtmlAbbrType() {
@@ -222,8 +319,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlAcronymType createXhtmlAcronymType() {
@@ -232,8 +329,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlAddressType createXhtmlAddressType() {
@@ -242,8 +339,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlAType createXhtmlAType() {
@@ -252,8 +349,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlBlockquoteType createXhtmlBlockquoteType() {
@@ -262,8 +359,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlBrType createXhtmlBrType() {
@@ -272,8 +369,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlCaptionType createXhtmlCaptionType() {
@@ -282,8 +379,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlCiteType createXhtmlCiteType() {
@@ -292,8 +389,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlCodeType createXhtmlCodeType() {
@@ -302,8 +399,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlColgroupType createXhtmlColgroupType() {
@@ -312,8 +409,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlColType createXhtmlColType() {
@@ -322,8 +419,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlDdType createXhtmlDdType() {
@@ -332,8 +429,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlDfnType createXhtmlDfnType() {
@@ -342,8 +439,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlDivType createXhtmlDivType() {
@@ -352,8 +449,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlDlType createXhtmlDlType() {
@@ -362,8 +459,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlDtType createXhtmlDtType() {
@@ -372,8 +469,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlEditType createXhtmlEditType() {
@@ -382,8 +479,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlEmType createXhtmlEmType() {
@@ -392,8 +489,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlH1Type createXhtmlH1Type() {
@@ -402,8 +499,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlH2Type createXhtmlH2Type() {
@@ -412,8 +509,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlH3Type createXhtmlH3Type() {
@@ -422,8 +519,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlH4Type createXhtmlH4Type() {
@@ -432,8 +529,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlH5Type createXhtmlH5Type() {
@@ -442,8 +539,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlH6Type createXhtmlH6Type() {
@@ -452,8 +549,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlHeadingType createXhtmlHeadingType() {
@@ -462,8 +559,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlHrType createXhtmlHrType() {
@@ -472,8 +569,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlInlPresType createXhtmlInlPresType() {
@@ -482,8 +579,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlKbdType createXhtmlKbdType() {
@@ -492,8 +589,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlLiType createXhtmlLiType() {
@@ -502,8 +599,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlObjectType createXhtmlObjectType() {
@@ -512,8 +609,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlOlType createXhtmlOlType() {
@@ -522,8 +619,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlParamType createXhtmlParamType() {
@@ -532,8 +629,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlPreType createXhtmlPreType() {
@@ -542,8 +639,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlPType createXhtmlPType() {
@@ -552,8 +649,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlQType createXhtmlQType() {
@@ -562,8 +659,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlSampType createXhtmlSampType() {
@@ -572,8 +669,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlSpanType createXhtmlSpanType() {
@@ -582,8 +679,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlStrongType createXhtmlStrongType() {
@@ -592,8 +689,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlTableType createXhtmlTableType() {
@@ -602,8 +699,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlTbodyType createXhtmlTbodyType() {
@@ -612,8 +709,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlTdType createXhtmlTdType() {
@@ -622,8 +719,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlTfootType createXhtmlTfootType() {
@@ -632,8 +729,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlTheadType createXhtmlTheadType() {
@@ -642,8 +739,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlThType createXhtmlThType() {
@@ -652,8 +749,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlTrType createXhtmlTrType() {
@@ -662,8 +759,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlUlType createXhtmlUlType() {
@@ -672,8 +769,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlVarType createXhtmlVarType() {
@@ -682,19 +779,20 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AlignType createAlignTypeFromString(EDataType eDataType, String initialValue) {
 		AlignType result = AlignType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertAlignTypeToString(EDataType eDataType, Object instanceValue) {
@@ -702,19 +800,20 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DeclareType createDeclareTypeFromString(EDataType eDataType, String initialValue) {
 		DeclareType result = DeclareType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertDeclareTypeToString(EDataType eDataType, Object instanceValue) {
@@ -722,19 +821,20 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FrameType createFrameTypeFromString(EDataType eDataType, String initialValue) {
 		FrameType result = FrameType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertFrameTypeToString(EDataType eDataType, Object instanceValue) {
@@ -742,19 +842,20 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RulesType createRulesTypeFromString(EDataType eDataType, String initialValue) {
 		RulesType result = RulesType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertRulesTypeToString(EDataType eDataType, Object instanceValue) {
@@ -762,19 +863,20 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ScopeType createScopeTypeFromString(EDataType eDataType, String initialValue) {
 		ScopeType result = ScopeType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertScopeTypeToString(EDataType eDataType, Object instanceValue) {
@@ -782,19 +884,20 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ValignType createValignTypeFromString(EDataType eDataType, String initialValue) {
 		ValignType result = ValignType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertValignTypeToString(EDataType eDataType, Object instanceValue) {
@@ -802,19 +905,20 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ValuetypeType createValuetypeTypeFromString(EDataType eDataType, String initialValue) {
 		ValuetypeType result = ValuetypeType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertValuetypeTypeToString(EDataType eDataType, Object instanceValue) {
@@ -822,8 +926,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AlignType createAlignTypeObjectFromString(EDataType eDataType, String initialValue) {
@@ -831,8 +935,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertAlignTypeObjectToString(EDataType eDataType, Object instanceValue) {
@@ -840,8 +944,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DeclareType createDeclareTypeObjectFromString(EDataType eDataType, String initialValue) {
@@ -849,8 +953,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertDeclareTypeObjectToString(EDataType eDataType, Object instanceValue) {
@@ -858,8 +962,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FrameType createFrameTypeObjectFromString(EDataType eDataType, String initialValue) {
@@ -867,8 +971,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertFrameTypeObjectToString(EDataType eDataType, Object instanceValue) {
@@ -876,8 +980,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RulesType createRulesTypeObjectFromString(EDataType eDataType, String initialValue) {
@@ -885,8 +989,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertRulesTypeObjectToString(EDataType eDataType, Object instanceValue) {
@@ -894,8 +998,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ScopeType createScopeTypeObjectFromString(EDataType eDataType, String initialValue) {
@@ -903,8 +1007,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertScopeTypeObjectToString(EDataType eDataType, Object instanceValue) {
@@ -912,8 +1016,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ValignType createValignTypeObjectFromString(EDataType eDataType, String initialValue) {
@@ -921,8 +1025,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertValignTypeObjectToString(EDataType eDataType, Object instanceValue) {
@@ -930,8 +1034,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ValuetypeType createValuetypeTypeObjectFromString(EDataType eDataType, String initialValue) {
@@ -939,8 +1043,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertValuetypeTypeObjectToString(EDataType eDataType, Object instanceValue) {
@@ -948,17 +1052,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlPackage getXhtmlPackage() {
-		return (XhtmlPackage)getEPackage();
+		return (XhtmlPackage) getEPackage();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -967,4 +1071,4 @@
 		return XhtmlPackage.eINSTANCE;
 	}
 
-} //XhtmlFactoryImpl
+} // XhtmlFactoryImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH1TypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH1TypeImpl.java
index 59761a5..b8943e9 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH1TypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH1TypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -51,54 +45,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>H1 Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>H1 Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH1TypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlH1TypeImpl extends EObjectImpl implements XhtmlH1Type {
+public class XhtmlH1TypeImpl extends MinimalEObjectImpl implements XhtmlH1Type {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -106,9 +98,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -116,9 +108,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -126,9 +118,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -136,9 +127,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -146,9 +136,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -156,9 +146,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -166,9 +156,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -176,9 +166,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -186,18 +176,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -205,9 +194,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -215,9 +204,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -225,9 +214,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -235,8 +224,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlH1TypeImpl() {
@@ -244,8 +233,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -254,8 +243,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -266,17 +255,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlH1Type_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlH1Type_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -284,8 +273,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -293,8 +282,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -302,8 +291,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -311,8 +300,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -320,8 +309,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -329,8 +318,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -338,8 +327,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -347,8 +336,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -356,8 +345,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -365,8 +354,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -374,8 +363,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -383,8 +372,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -392,8 +381,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -401,8 +390,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -410,8 +399,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -419,8 +408,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -428,8 +417,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -437,8 +426,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -446,8 +435,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -455,8 +444,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -464,8 +453,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -473,8 +462,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -482,8 +471,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -491,8 +480,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -500,8 +489,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -512,8 +501,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -521,8 +510,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -533,8 +522,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -542,8 +531,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -554,8 +543,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -563,8 +552,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -577,8 +566,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -591,8 +580,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -600,8 +589,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -609,8 +598,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -621,8 +610,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -630,8 +619,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -642,490 +631,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H1_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H1_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H1_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H1_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_H1_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_H1_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_H1_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_H1_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_H1_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_H1_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_H1_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_H1_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_H1_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_H1_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_H1_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_H1_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_H1_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_H1_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_H1_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_H1_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_H1_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_H1_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_H1_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_H1_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_H1_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_H1_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_H1_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_H1_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_H1_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_H1_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_H1_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_H1_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_H1_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_H1_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_H1_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_H1_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_H1_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_H1_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_H1_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_H1_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_H1_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_H1_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_H1_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_H1_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_H1_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_H1_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_H1_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_H1_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_H1_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_H1_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_H1_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_H1_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_H1_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_H1_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_H1_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_H1_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_H1_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_H1_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_H1_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_H1_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_H1_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_H1_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_H1_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_H1_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_H1_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_H1_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_H1_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H1_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_H1_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H1_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H1_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_H1_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H1_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H1_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_H1_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_H1_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_H1_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_H1_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_H1_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_H1_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_H1_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_H1_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_H1_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_H1_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_H1_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_H1_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_H1_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlH1TypeImpl
+} // XhtmlH1TypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH2TypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH2TypeImpl.java
index 07a717e..b6bfc7f 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH2TypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH2TypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -51,54 +45,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>H2 Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>H2 Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH2TypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlH2TypeImpl extends EObjectImpl implements XhtmlH2Type {
+public class XhtmlH2TypeImpl extends MinimalEObjectImpl implements XhtmlH2Type {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -106,9 +98,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -116,9 +108,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -126,9 +118,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -136,9 +127,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -146,9 +136,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -156,9 +146,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -166,9 +156,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -176,9 +166,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -186,18 +176,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -205,9 +194,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -215,9 +204,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -225,9 +214,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -235,8 +224,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlH2TypeImpl() {
@@ -244,8 +233,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -254,8 +243,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -266,17 +255,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlH2Type_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlH2Type_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -284,8 +273,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -293,8 +282,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -302,8 +291,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -311,8 +300,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -320,8 +309,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -329,8 +318,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -338,8 +327,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -347,8 +336,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -356,8 +345,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -365,8 +354,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -374,8 +363,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -383,8 +372,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -392,8 +381,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -401,8 +390,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -410,8 +399,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -419,8 +408,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -428,8 +417,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -437,8 +426,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -446,8 +435,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -455,8 +444,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -464,8 +453,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -473,8 +462,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -482,8 +471,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -491,8 +480,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -500,8 +489,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -512,8 +501,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -521,8 +510,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -533,8 +522,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -542,8 +531,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -554,8 +543,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -563,8 +552,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -577,8 +566,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -591,8 +580,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -600,8 +589,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -609,8 +598,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -621,8 +610,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -630,8 +619,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -642,490 +631,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H2_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H2_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H2_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H2_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_H2_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_H2_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_H2_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_H2_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_H2_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_H2_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_H2_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_H2_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_H2_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_H2_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_H2_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_H2_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_H2_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_H2_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_H2_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_H2_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_H2_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_H2_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_H2_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_H2_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_H2_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_H2_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_H2_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_H2_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_H2_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_H2_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_H2_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_H2_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_H2_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_H2_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_H2_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_H2_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_H2_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_H2_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_H2_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_H2_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_H2_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_H2_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_H2_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_H2_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_H2_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_H2_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_H2_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_H2_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_H2_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_H2_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_H2_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_H2_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_H2_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_H2_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_H2_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_H2_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_H2_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_H2_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_H2_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_H2_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_H2_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_H2_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_H2_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_H2_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_H2_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_H2_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_H2_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H2_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_H2_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H2_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H2_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_H2_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H2_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H2_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_H2_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_H2_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_H2_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_H2_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_H2_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_H2_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_H2_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_H2_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_H2_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_H2_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_H2_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_H2_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_H2_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlH2TypeImpl
+} // XhtmlH2TypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH3TypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH3TypeImpl.java
index 0afae3c..f13cd17 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH3TypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH3TypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -51,54 +45,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>H3 Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>H3 Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH3TypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlH3TypeImpl extends EObjectImpl implements XhtmlH3Type {
+public class XhtmlH3TypeImpl extends MinimalEObjectImpl implements XhtmlH3Type {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -106,9 +98,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -116,9 +108,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -126,9 +118,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -136,9 +127,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -146,9 +136,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -156,9 +146,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -166,9 +156,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -176,9 +166,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -186,18 +176,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -205,9 +194,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -215,9 +204,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -225,9 +214,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -235,8 +224,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlH3TypeImpl() {
@@ -244,8 +233,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -254,8 +243,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -266,17 +255,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlH3Type_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlH3Type_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -284,8 +273,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -293,8 +282,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -302,8 +291,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -311,8 +300,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -320,8 +309,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -329,8 +318,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -338,8 +327,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -347,8 +336,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -356,8 +345,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -365,8 +354,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -374,8 +363,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -383,8 +372,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -392,8 +381,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -401,8 +390,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -410,8 +399,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -419,8 +408,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -428,8 +417,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -437,8 +426,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -446,8 +435,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -455,8 +444,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -464,8 +453,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -473,8 +462,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -482,8 +471,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -491,8 +480,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -500,8 +489,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -512,8 +501,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -521,8 +510,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -533,8 +522,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -542,8 +531,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -554,8 +543,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -563,8 +552,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -577,8 +566,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -591,8 +580,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -600,8 +589,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -609,8 +598,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -621,8 +610,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -630,8 +619,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -642,490 +631,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H3_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H3_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H3_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H3_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_H3_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_H3_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_H3_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_H3_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_H3_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_H3_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_H3_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_H3_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_H3_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_H3_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_H3_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_H3_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_H3_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_H3_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_H3_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_H3_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_H3_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_H3_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_H3_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_H3_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_H3_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_H3_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_H3_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_H3_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_H3_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_H3_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_H3_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_H3_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_H3_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_H3_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_H3_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_H3_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_H3_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_H3_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_H3_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_H3_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_H3_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_H3_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_H3_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_H3_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_H3_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_H3_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_H3_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_H3_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_H3_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_H3_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_H3_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_H3_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_H3_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_H3_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_H3_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_H3_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_H3_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_H3_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_H3_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_H3_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_H3_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_H3_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_H3_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_H3_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_H3_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_H3_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_H3_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H3_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_H3_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H3_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H3_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_H3_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H3_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H3_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_H3_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_H3_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_H3_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_H3_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_H3_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_H3_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_H3_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_H3_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_H3_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_H3_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_H3_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_H3_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_H3_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlH3TypeImpl
+} // XhtmlH3TypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH4TypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH4TypeImpl.java
index 60abb6f..cb77623 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH4TypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH4TypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -51,54 +45,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>H4 Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>H4 Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH4TypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlH4TypeImpl extends EObjectImpl implements XhtmlH4Type {
+public class XhtmlH4TypeImpl extends MinimalEObjectImpl implements XhtmlH4Type {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -106,9 +98,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -116,9 +108,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -126,9 +118,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -136,9 +127,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -146,9 +136,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -156,9 +146,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -166,9 +156,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -176,9 +166,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -186,18 +176,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -205,9 +194,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -215,9 +204,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -225,9 +214,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -235,8 +224,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlH4TypeImpl() {
@@ -244,8 +233,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -254,8 +243,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -266,17 +255,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlH4Type_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlH4Type_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -284,8 +273,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -293,8 +282,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -302,8 +291,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -311,8 +300,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -320,8 +309,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -329,8 +318,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -338,8 +327,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -347,8 +336,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -356,8 +345,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -365,8 +354,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -374,8 +363,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -383,8 +372,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -392,8 +381,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -401,8 +390,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -410,8 +399,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -419,8 +408,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -428,8 +417,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -437,8 +426,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -446,8 +435,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -455,8 +444,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -464,8 +453,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -473,8 +462,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -482,8 +471,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -491,8 +480,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -500,8 +489,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -512,8 +501,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -521,8 +510,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -533,8 +522,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -542,8 +531,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -554,8 +543,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -563,8 +552,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -577,8 +566,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -591,8 +580,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -600,8 +589,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -609,8 +598,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -621,8 +610,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -630,8 +619,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -642,490 +631,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H4_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H4_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H4_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H4_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_H4_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_H4_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_H4_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_H4_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_H4_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_H4_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_H4_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_H4_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_H4_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_H4_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_H4_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_H4_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_H4_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_H4_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_H4_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_H4_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_H4_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_H4_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_H4_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_H4_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_H4_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_H4_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_H4_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_H4_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_H4_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_H4_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_H4_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_H4_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_H4_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_H4_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_H4_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_H4_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_H4_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_H4_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_H4_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_H4_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_H4_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_H4_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_H4_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_H4_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_H4_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_H4_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_H4_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_H4_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_H4_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_H4_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_H4_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_H4_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_H4_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_H4_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_H4_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_H4_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_H4_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_H4_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_H4_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_H4_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_H4_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_H4_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_H4_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_H4_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_H4_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_H4_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_H4_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H4_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_H4_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H4_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H4_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_H4_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H4_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H4_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_H4_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_H4_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_H4_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_H4_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_H4_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_H4_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_H4_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_H4_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_H4_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_H4_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_H4_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_H4_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_H4_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlH4TypeImpl
+} // XhtmlH4TypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH5TypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH5TypeImpl.java
index b2d77e7..c99919a 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH5TypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH5TypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -51,54 +45,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>H5 Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>H5 Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH5TypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlH5TypeImpl extends EObjectImpl implements XhtmlH5Type {
+public class XhtmlH5TypeImpl extends MinimalEObjectImpl implements XhtmlH5Type {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -106,9 +98,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -116,9 +108,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -126,9 +118,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -136,9 +127,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -146,9 +136,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -156,9 +146,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -166,9 +156,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -176,9 +166,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -186,18 +176,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -205,9 +194,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -215,9 +204,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -225,9 +214,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -235,8 +224,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlH5TypeImpl() {
@@ -244,8 +233,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -254,8 +243,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -266,17 +255,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlH5Type_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlH5Type_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -284,8 +273,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -293,8 +282,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -302,8 +291,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -311,8 +300,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -320,8 +309,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -329,8 +318,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -338,8 +327,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -347,8 +336,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -356,8 +345,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -365,8 +354,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -374,8 +363,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -383,8 +372,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -392,8 +381,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -401,8 +390,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -410,8 +399,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -419,8 +408,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -428,8 +417,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -437,8 +426,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -446,8 +435,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -455,8 +444,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -464,8 +453,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -473,8 +462,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -482,8 +471,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -491,8 +480,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -500,8 +489,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -512,8 +501,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -521,8 +510,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -533,8 +522,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -542,8 +531,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -554,8 +543,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -563,8 +552,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -577,8 +566,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -591,8 +580,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -600,8 +589,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -609,8 +598,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -621,8 +610,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -630,8 +619,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -642,490 +631,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H5_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H5_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H5_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H5_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_H5_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_H5_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_H5_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_H5_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_H5_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_H5_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_H5_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_H5_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_H5_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_H5_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_H5_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_H5_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_H5_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_H5_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_H5_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_H5_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_H5_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_H5_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_H5_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_H5_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_H5_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_H5_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_H5_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_H5_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_H5_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_H5_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_H5_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_H5_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_H5_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_H5_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_H5_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_H5_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_H5_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_H5_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_H5_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_H5_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_H5_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_H5_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_H5_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_H5_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_H5_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_H5_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_H5_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_H5_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_H5_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_H5_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_H5_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_H5_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_H5_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_H5_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_H5_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_H5_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_H5_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_H5_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_H5_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_H5_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_H5_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_H5_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_H5_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_H5_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_H5_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_H5_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_H5_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H5_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_H5_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H5_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H5_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_H5_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H5_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H5_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_H5_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_H5_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_H5_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_H5_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_H5_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_H5_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_H5_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_H5_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_H5_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_H5_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_H5_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_H5_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_H5_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlH5TypeImpl
+} // XhtmlH5TypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH6TypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH6TypeImpl.java
index 0200e68..7eb9bb7 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH6TypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlH6TypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -51,54 +45,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>H6 Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>H6 Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlH6TypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlH6TypeImpl extends EObjectImpl implements XhtmlH6Type {
+public class XhtmlH6TypeImpl extends MinimalEObjectImpl implements XhtmlH6Type {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -106,9 +98,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -116,9 +108,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -126,9 +118,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -136,9 +127,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -146,9 +136,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -156,9 +146,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -166,9 +156,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -176,9 +166,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -186,18 +176,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -205,9 +194,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -215,9 +204,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -225,9 +214,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -235,8 +224,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlH6TypeImpl() {
@@ -244,8 +233,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -254,8 +243,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -266,17 +255,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlH6Type_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlH6Type_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -284,8 +273,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -293,8 +282,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -302,8 +291,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -311,8 +300,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -320,8 +309,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -329,8 +318,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -338,8 +327,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -347,8 +336,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -356,8 +345,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -365,8 +354,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -374,8 +363,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -383,8 +372,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -392,8 +381,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -401,8 +390,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -410,8 +399,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -419,8 +408,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -428,8 +417,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -437,8 +426,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -446,8 +435,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -455,8 +444,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -464,8 +453,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -473,8 +462,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -482,8 +471,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -491,8 +480,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -500,8 +489,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -512,8 +501,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -521,8 +510,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -533,8 +522,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -542,8 +531,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -554,8 +543,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -563,8 +552,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -577,8 +566,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -591,8 +580,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -600,8 +589,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -609,8 +598,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -621,8 +610,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -630,8 +619,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -642,490 +631,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H6_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_H6_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_H6_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H6_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_H6_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_H6_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_H6_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_H6_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_H6_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_H6_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_H6_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_H6_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_H6_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_H6_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_H6_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_H6_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_H6_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_H6_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_H6_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_H6_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_H6_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_H6_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_H6_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_H6_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_H6_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_H6_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_H6_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_H6_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_H6_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_H6_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_H6_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_H6_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_H6_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_H6_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_H6_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_H6_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_H6_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_H6_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_H6_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_H6_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_H6_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_H6_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_H6_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_H6_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_H6_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_H6_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_H6_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_H6_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_H6_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_H6_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_H6_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_H6_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_H6_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_H6_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_H6_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_H6_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_H6_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_H6_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_H6_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_H6_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_H6_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_H6_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_H6_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_H6_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_H6_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_H6_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_H6_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H6_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_H6_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H6_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_H6_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_H6_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_H6_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_H6_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_H6_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_H6_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_H6_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_H6_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_H6_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_H6_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_H6_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_H6_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_H6_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_H6_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_H6_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_H6_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_H6_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlH6TypeImpl
+} // XhtmlH6TypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlHeadingTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlHeadingTypeImpl.java
index ac57943..d684eae 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlHeadingTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlHeadingTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -51,54 +45,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Heading Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Heading Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHeadingTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlHeadingTypeImpl extends EObjectImpl implements XhtmlHeadingType {
+public class XhtmlHeadingTypeImpl extends MinimalEObjectImpl implements XhtmlHeadingType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -106,9 +98,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -116,9 +108,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -126,9 +118,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -136,9 +127,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -146,9 +136,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -156,9 +146,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -166,9 +156,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -176,9 +166,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -186,18 +176,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -205,9 +194,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -215,9 +204,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -225,9 +214,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -235,8 +224,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlHeadingTypeImpl() {
@@ -244,8 +233,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -254,8 +243,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -266,17 +255,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlHeadingType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -284,8 +273,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -293,8 +282,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -302,8 +291,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -311,8 +300,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -320,8 +309,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -329,8 +318,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -338,8 +327,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -347,8 +336,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -356,8 +345,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -365,8 +354,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -374,8 +363,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -383,8 +372,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -392,8 +381,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -401,8 +390,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -410,8 +399,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -419,8 +408,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -428,8 +417,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -437,8 +426,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -446,8 +435,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -455,8 +444,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -464,8 +453,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -473,8 +462,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -482,8 +471,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -491,8 +480,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -500,8 +489,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -512,8 +501,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -521,8 +510,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -533,8 +522,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -542,8 +531,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -554,8 +543,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -563,8 +552,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -577,8 +566,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -591,8 +580,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -600,8 +589,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -609,8 +598,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -621,8 +610,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -630,8 +619,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -642,490 +631,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_HEADING_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_HEADING_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_HEADING_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_HEADING_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_HEADING_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_HEADING_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_HEADING_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_HEADING_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_HEADING_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_HEADING_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_HEADING_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_HEADING_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_HEADING_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_HEADING_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_HEADING_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_HEADING_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_HEADING_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_HEADING_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_HEADING_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_HEADING_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_HEADING_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_HEADING_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_HEADING_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_HEADING_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_HEADING_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_HEADING_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_HEADING_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_HEADING_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_HEADING_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_HEADING_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_HEADING_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_HEADING_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_HEADING_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_HEADING_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_HEADING_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_HEADING_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_HEADING_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_HEADING_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_HEADING_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_HEADING_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_HEADING_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_HEADING_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_HEADING_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_HEADING_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_HEADING_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_HEADING_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_HEADING_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_HEADING_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_HEADING_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_HEADING_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_HEADING_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_HEADING_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_HEADING_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_HEADING_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_HEADING_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_HEADING_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_HEADING_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_HEADING_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_HEADING_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_HEADING_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_HEADING_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_HEADING_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_HEADING_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_HEADING_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_HEADING_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_HEADING_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_HEADING_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_HEADING_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_HEADING_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_HEADING_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_HEADING_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_HEADING_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_HEADING_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_HEADING_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_HEADING_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_HEADING_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_HEADING_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_HEADING_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_HEADING_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_HEADING_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_HEADING_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_HEADING_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_HEADING_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_HEADING_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_HEADING_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlHeadingTypeImpl
+} // XhtmlHeadingTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlHrTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlHrTypeImpl.java
index f66f8bb..c86e338 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlHrTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlHrTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,40 +12,34 @@
 package org.eclipse.rmf.reqif10.xhtml.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlHrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Hr Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Hr Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHrTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHrTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHrTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHrTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHrTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHrTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHrTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHrTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHrTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHrTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHrTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlHrTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlHrTypeImpl extends EObjectImpl implements XhtmlHrType {
+public class XhtmlHrTypeImpl extends MinimalEObjectImpl implements XhtmlHrType {
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -53,9 +47,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -63,9 +57,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -73,9 +66,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -83,9 +75,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -93,9 +85,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -103,9 +95,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -113,9 +105,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -123,18 +115,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -142,9 +133,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -152,9 +143,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -162,9 +153,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -172,8 +163,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlHrTypeImpl() {
@@ -181,8 +172,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -191,8 +182,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -200,8 +191,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -212,8 +203,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -221,8 +212,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -233,8 +224,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -242,8 +233,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -254,8 +245,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -263,8 +254,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -277,8 +268,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -291,8 +282,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -300,8 +291,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -309,8 +300,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -321,8 +312,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -330,8 +321,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -342,137 +333,141 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_HR_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_HR_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_HR_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_HR_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_HR_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_HR_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_HR_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_HR_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_HR_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_HR_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_HR_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_HR_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_HR_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_HR_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_HR_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_HR_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_HR_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_HR_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_HR_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_HR_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_HR_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_HR_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_HR_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_HR_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_HR_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_HR_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_HR_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_HR_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_HR_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_HR_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_HR_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_HR_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_HR_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_HR_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_HR_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_HR_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_HR_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_HR_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_HR_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_HR_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_HR_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_HR_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_HR_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_HR_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_HR_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_HR_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_HR_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_HR_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (class: ");
+		result.append(" (class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlHrTypeImpl
+} // XhtmlHrTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlInlPresTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlInlPresTypeImpl.java
index 34a0052..8b6186d 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlInlPresTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlInlPresTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -50,54 +44,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Inl Pres Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Inl Pres Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlInlPresTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlInlPresTypeImpl extends EObjectImpl implements XhtmlInlPresType {
+public class XhtmlInlPresTypeImpl extends MinimalEObjectImpl implements XhtmlInlPresType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -105,9 +97,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -115,9 +107,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -125,9 +117,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -135,9 +126,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -145,9 +135,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -155,9 +145,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -165,9 +155,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -175,9 +165,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -185,18 +175,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -204,9 +193,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -214,9 +203,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -224,9 +213,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -234,8 +223,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlInlPresTypeImpl() {
@@ -243,8 +232,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -253,8 +242,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -265,17 +254,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlInlPresType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -283,8 +272,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -292,8 +281,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -301,8 +290,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -310,8 +299,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -319,8 +308,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -328,8 +317,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -337,8 +326,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -346,8 +335,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -355,8 +344,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -364,8 +353,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -373,8 +362,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -382,8 +371,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -391,8 +380,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -400,8 +389,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -409,8 +398,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -418,8 +407,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -427,8 +416,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -436,8 +425,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -445,8 +434,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -454,8 +443,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -463,8 +452,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -472,8 +461,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -481,8 +470,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -490,8 +479,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -499,8 +488,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -511,8 +500,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -520,8 +509,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -532,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -541,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -553,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -562,8 +551,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -576,8 +565,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -590,8 +579,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -599,8 +588,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -608,8 +597,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -620,8 +609,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -629,8 +618,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -641,490 +630,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_INL_PRES_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_INL_PRES_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlInlPresTypeImpl
+} // XhtmlInlPresTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlKbdTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlKbdTypeImpl.java
index 8a5087a..cd4ace0 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlKbdTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlKbdTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -50,54 +44,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Kbd Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Kbd Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlKbdTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlKbdTypeImpl extends EObjectImpl implements XhtmlKbdType {
+public class XhtmlKbdTypeImpl extends MinimalEObjectImpl implements XhtmlKbdType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -105,9 +97,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -115,9 +107,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -125,9 +117,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -135,9 +126,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -145,9 +135,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -155,9 +145,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -165,9 +155,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -175,9 +165,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -185,18 +175,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -204,9 +193,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -214,9 +203,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -224,9 +213,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -234,8 +223,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlKbdTypeImpl() {
@@ -243,8 +232,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -253,8 +242,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -265,17 +254,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlKbdType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlKbdType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -283,8 +272,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -292,8 +281,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -301,8 +290,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -310,8 +299,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -319,8 +308,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -328,8 +317,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -337,8 +326,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -346,8 +335,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -355,8 +344,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -364,8 +353,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -373,8 +362,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -382,8 +371,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -391,8 +380,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -400,8 +389,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -409,8 +398,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -418,8 +407,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -427,8 +416,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -436,8 +425,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -445,8 +434,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -454,8 +443,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -463,8 +452,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -472,8 +461,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -481,8 +470,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -490,8 +479,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -499,8 +488,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -511,8 +500,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -520,8 +509,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -532,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -541,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -553,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -562,8 +551,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -576,8 +565,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -590,8 +579,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -599,8 +588,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -608,8 +597,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -620,8 +609,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -629,8 +618,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -641,490 +630,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_KBD_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_KBD_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_KBD_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_KBD_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_KBD_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_KBD_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_KBD_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_KBD_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_KBD_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_KBD_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_KBD_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_KBD_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_KBD_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_KBD_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_KBD_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_KBD_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_KBD_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_KBD_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_KBD_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_KBD_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_KBD_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_KBD_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_KBD_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_KBD_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_KBD_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_KBD_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_KBD_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_KBD_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_KBD_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_KBD_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_KBD_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_KBD_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_KBD_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_KBD_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_KBD_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_KBD_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_KBD_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_KBD_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_KBD_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_KBD_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_KBD_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_KBD_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_KBD_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_KBD_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_KBD_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_KBD_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_KBD_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_KBD_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_KBD_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_KBD_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_KBD_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_KBD_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_KBD_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_KBD_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_KBD_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_KBD_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_KBD_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_KBD_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_KBD_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_KBD_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_KBD_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_KBD_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_KBD_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_KBD_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_KBD_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_KBD_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_KBD_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_KBD_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_KBD_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_KBD_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_KBD_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_KBD_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_KBD_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_KBD_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_KBD_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_KBD_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_KBD_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_KBD_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_KBD_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_KBD_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_KBD_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_KBD_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_KBD_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_KBD_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_KBD_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_KBD_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_KBD_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlKbdTypeImpl
+} // XhtmlKbdTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlLiTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlLiTypeImpl.java
index 6c2e3f9..78761ca 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlLiTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlLiTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -67,70 +61,68 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Li Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Li Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getH1 <em>H1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getH2 <em>H2</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getH3 <em>H3</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getH4 <em>H4</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getH5 <em>H5</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getH6 <em>H6</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getUl <em>Ul</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getOl <em>Ol</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getDl <em>Dl</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getPre <em>Pre</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getBlockquote <em>Blockquote</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getHr <em>Hr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getH1 <em>H1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getH2 <em>H2</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getH3 <em>H3</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getH4 <em>H4</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getH5 <em>H5</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getH6 <em>H6</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getUl <em>Ul</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getOl <em>Ol</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getDl <em>Dl</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getPre <em>Pre</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getBlockquote <em>Blockquote</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getAddress <em>Address</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getHr <em>Hr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlLiTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlLiTypeImpl extends EObjectImpl implements XhtmlLiType {
+public class XhtmlLiTypeImpl extends MinimalEObjectImpl implements XhtmlLiType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -138,9 +130,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -148,9 +140,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -158,9 +150,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -168,9 +159,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -178,9 +168,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -188,9 +178,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -198,9 +188,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -208,9 +198,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -218,18 +208,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -237,9 +226,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -247,9 +236,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -257,9 +246,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -267,8 +256,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlLiTypeImpl() {
@@ -276,8 +265,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -286,8 +275,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -298,17 +287,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlFlowMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlLiType_XhtmlFlowMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlLiType_XhtmlFlowMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH1Type> getH1() {
@@ -316,8 +305,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH2Type> getH2() {
@@ -325,8 +314,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH3Type> getH3() {
@@ -334,8 +323,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH4Type> getH4() {
@@ -343,8 +332,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH5Type> getH5() {
@@ -352,8 +341,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH6Type> getH6() {
@@ -361,8 +350,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlUlType> getUl() {
@@ -370,8 +359,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlOlType> getOl() {
@@ -379,8 +368,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDlType> getDl() {
@@ -388,8 +377,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlPType> getP() {
@@ -397,8 +386,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDivType> getDiv() {
@@ -406,8 +395,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlPreType> getPre() {
@@ -415,8 +404,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBlockquoteType> getBlockquote() {
@@ -424,8 +413,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAddressType> getAddress() {
@@ -433,8 +422,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlHrType> getHr() {
@@ -442,8 +431,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlTableType> getTable() {
@@ -451,8 +440,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -460,8 +449,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -469,8 +458,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -478,8 +467,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -487,8 +476,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -496,8 +485,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -505,8 +494,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -514,8 +503,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -523,8 +512,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -532,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -541,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -550,8 +539,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -559,8 +548,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -568,8 +557,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -577,8 +566,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -586,8 +575,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -595,8 +584,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -604,8 +593,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -613,8 +602,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -622,8 +611,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -631,8 +620,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -640,8 +629,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -649,8 +638,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -658,8 +647,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -667,8 +656,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -676,8 +665,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -688,8 +677,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -697,8 +686,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -709,8 +698,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -718,8 +707,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -730,8 +719,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -739,8 +728,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -753,8 +742,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -767,8 +756,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -776,8 +765,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -785,8 +774,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -797,8 +786,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -806,8 +795,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -818,698 +807,704 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_LI_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__XHTML_FLOW_MIX:
-				return ((InternalEList<?>)getXhtmlFlowMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__H1:
-				return ((InternalEList<?>)getH1()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__H2:
-				return ((InternalEList<?>)getH2()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__H3:
-				return ((InternalEList<?>)getH3()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__H4:
-				return ((InternalEList<?>)getH4()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__H5:
-				return ((InternalEList<?>)getH5()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__H6:
-				return ((InternalEList<?>)getH6()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__UL:
-				return ((InternalEList<?>)getUl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__OL:
-				return ((InternalEList<?>)getOl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__DL:
-				return ((InternalEList<?>)getDl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__P:
-				return ((InternalEList<?>)getP()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__DIV:
-				return ((InternalEList<?>)getDiv()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__PRE:
-				return ((InternalEList<?>)getPre()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__BLOCKQUOTE:
-				return ((InternalEList<?>)getBlockquote()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__ADDRESS:
-				return ((InternalEList<?>)getAddress()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__HR:
-				return ((InternalEList<?>)getHr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__TABLE:
-				return ((InternalEList<?>)getTable()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_LI_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__XHTML_FLOW_MIX:
+			return ((InternalEList<?>) getXhtmlFlowMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__H1:
+			return ((InternalEList<?>) getH1()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__H2:
+			return ((InternalEList<?>) getH2()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__H3:
+			return ((InternalEList<?>) getH3()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__H4:
+			return ((InternalEList<?>) getH4()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__H5:
+			return ((InternalEList<?>) getH5()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__H6:
+			return ((InternalEList<?>) getH6()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__UL:
+			return ((InternalEList<?>) getUl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__OL:
+			return ((InternalEList<?>) getOl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__DL:
+			return ((InternalEList<?>) getDl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__P:
+			return ((InternalEList<?>) getP()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__DIV:
+			return ((InternalEList<?>) getDiv()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__PRE:
+			return ((InternalEList<?>) getPre()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__BLOCKQUOTE:
+			return ((InternalEList<?>) getBlockquote()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__ADDRESS:
+			return ((InternalEList<?>) getAddress()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__HR:
+			return ((InternalEList<?>) getHr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__TABLE:
+			return ((InternalEList<?>) getTable()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_LI_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_LI_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_LI_TYPE__XHTML_FLOW_MIX:
-				if (coreType) return getXhtmlFlowMix();
-				return ((FeatureMap.Internal)getXhtmlFlowMix()).getWrapper();
-			case XhtmlPackage.XHTML_LI_TYPE__H1:
-				return getH1();
-			case XhtmlPackage.XHTML_LI_TYPE__H2:
-				return getH2();
-			case XhtmlPackage.XHTML_LI_TYPE__H3:
-				return getH3();
-			case XhtmlPackage.XHTML_LI_TYPE__H4:
-				return getH4();
-			case XhtmlPackage.XHTML_LI_TYPE__H5:
-				return getH5();
-			case XhtmlPackage.XHTML_LI_TYPE__H6:
-				return getH6();
-			case XhtmlPackage.XHTML_LI_TYPE__UL:
-				return getUl();
-			case XhtmlPackage.XHTML_LI_TYPE__OL:
-				return getOl();
-			case XhtmlPackage.XHTML_LI_TYPE__DL:
-				return getDl();
-			case XhtmlPackage.XHTML_LI_TYPE__P:
-				return getP();
-			case XhtmlPackage.XHTML_LI_TYPE__DIV:
-				return getDiv();
-			case XhtmlPackage.XHTML_LI_TYPE__PRE:
-				return getPre();
-			case XhtmlPackage.XHTML_LI_TYPE__BLOCKQUOTE:
-				return getBlockquote();
-			case XhtmlPackage.XHTML_LI_TYPE__ADDRESS:
-				return getAddress();
-			case XhtmlPackage.XHTML_LI_TYPE__HR:
-				return getHr();
-			case XhtmlPackage.XHTML_LI_TYPE__TABLE:
-				return getTable();
-			case XhtmlPackage.XHTML_LI_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_LI_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_LI_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_LI_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_LI_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_LI_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_LI_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_LI_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_LI_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_LI_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_LI_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_LI_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_LI_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_LI_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_LI_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_LI_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_LI_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_LI_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_LI_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_LI_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_LI_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_LI_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_LI_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_LI_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_LI_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_LI_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_LI_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_LI_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_LI_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_LI_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_LI_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_LI_TYPE__XHTML_FLOW_MIX:
+			if (coreType)
+				return getXhtmlFlowMix();
+			return ((FeatureMap.Internal) getXhtmlFlowMix()).getWrapper();
+		case XhtmlPackage.XHTML_LI_TYPE__H1:
+			return getH1();
+		case XhtmlPackage.XHTML_LI_TYPE__H2:
+			return getH2();
+		case XhtmlPackage.XHTML_LI_TYPE__H3:
+			return getH3();
+		case XhtmlPackage.XHTML_LI_TYPE__H4:
+			return getH4();
+		case XhtmlPackage.XHTML_LI_TYPE__H5:
+			return getH5();
+		case XhtmlPackage.XHTML_LI_TYPE__H6:
+			return getH6();
+		case XhtmlPackage.XHTML_LI_TYPE__UL:
+			return getUl();
+		case XhtmlPackage.XHTML_LI_TYPE__OL:
+			return getOl();
+		case XhtmlPackage.XHTML_LI_TYPE__DL:
+			return getDl();
+		case XhtmlPackage.XHTML_LI_TYPE__P:
+			return getP();
+		case XhtmlPackage.XHTML_LI_TYPE__DIV:
+			return getDiv();
+		case XhtmlPackage.XHTML_LI_TYPE__PRE:
+			return getPre();
+		case XhtmlPackage.XHTML_LI_TYPE__BLOCKQUOTE:
+			return getBlockquote();
+		case XhtmlPackage.XHTML_LI_TYPE__ADDRESS:
+			return getAddress();
+		case XhtmlPackage.XHTML_LI_TYPE__HR:
+			return getHr();
+		case XhtmlPackage.XHTML_LI_TYPE__TABLE:
+			return getTable();
+		case XhtmlPackage.XHTML_LI_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_LI_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_LI_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_LI_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_LI_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_LI_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_LI_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_LI_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_LI_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_LI_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_LI_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_LI_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_LI_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_LI_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_LI_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_LI_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_LI_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_LI_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_LI_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_LI_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_LI_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_LI_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_LI_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_LI_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_LI_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_LI_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_LI_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_LI_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_LI_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_LI_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_LI_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__XHTML_FLOW_MIX:
-				((FeatureMap.Internal)getXhtmlFlowMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__H1:
-				getH1().clear();
-				getH1().addAll((Collection<? extends XhtmlH1Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__H2:
-				getH2().clear();
-				getH2().addAll((Collection<? extends XhtmlH2Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__H3:
-				getH3().clear();
-				getH3().addAll((Collection<? extends XhtmlH3Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__H4:
-				getH4().clear();
-				getH4().addAll((Collection<? extends XhtmlH4Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__H5:
-				getH5().clear();
-				getH5().addAll((Collection<? extends XhtmlH5Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__H6:
-				getH6().clear();
-				getH6().addAll((Collection<? extends XhtmlH6Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__UL:
-				getUl().clear();
-				getUl().addAll((Collection<? extends XhtmlUlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__OL:
-				getOl().clear();
-				getOl().addAll((Collection<? extends XhtmlOlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__DL:
-				getDl().clear();
-				getDl().addAll((Collection<? extends XhtmlDlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__P:
-				getP().clear();
-				getP().addAll((Collection<? extends XhtmlPType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__DIV:
-				getDiv().clear();
-				getDiv().addAll((Collection<? extends XhtmlDivType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__PRE:
-				getPre().clear();
-				getPre().addAll((Collection<? extends XhtmlPreType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__BLOCKQUOTE:
-				getBlockquote().clear();
-				getBlockquote().addAll((Collection<? extends XhtmlBlockquoteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__ADDRESS:
-				getAddress().clear();
-				getAddress().addAll((Collection<? extends XhtmlAddressType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__HR:
-				getHr().clear();
-				getHr().addAll((Collection<? extends XhtmlHrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__TABLE:
-				getTable().clear();
-				getTable().addAll((Collection<? extends XhtmlTableType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_LI_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__XHTML_FLOW_MIX:
+			((FeatureMap.Internal) getXhtmlFlowMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__H1:
+			getH1().clear();
+			getH1().addAll((Collection<? extends XhtmlH1Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__H2:
+			getH2().clear();
+			getH2().addAll((Collection<? extends XhtmlH2Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__H3:
+			getH3().clear();
+			getH3().addAll((Collection<? extends XhtmlH3Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__H4:
+			getH4().clear();
+			getH4().addAll((Collection<? extends XhtmlH4Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__H5:
+			getH5().clear();
+			getH5().addAll((Collection<? extends XhtmlH5Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__H6:
+			getH6().clear();
+			getH6().addAll((Collection<? extends XhtmlH6Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__UL:
+			getUl().clear();
+			getUl().addAll((Collection<? extends XhtmlUlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__OL:
+			getOl().clear();
+			getOl().addAll((Collection<? extends XhtmlOlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__DL:
+			getDl().clear();
+			getDl().addAll((Collection<? extends XhtmlDlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__P:
+			getP().clear();
+			getP().addAll((Collection<? extends XhtmlPType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__DIV:
+			getDiv().clear();
+			getDiv().addAll((Collection<? extends XhtmlDivType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__PRE:
+			getPre().clear();
+			getPre().addAll((Collection<? extends XhtmlPreType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__BLOCKQUOTE:
+			getBlockquote().clear();
+			getBlockquote().addAll((Collection<? extends XhtmlBlockquoteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__ADDRESS:
+			getAddress().clear();
+			getAddress().addAll((Collection<? extends XhtmlAddressType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__HR:
+			getHr().clear();
+			getHr().addAll((Collection<? extends XhtmlHrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__TABLE:
+			getTable().clear();
+			getTable().addAll((Collection<? extends XhtmlTableType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_LI_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__XHTML_FLOW_MIX:
-				getXhtmlFlowMix().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__H1:
-				getH1().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__H2:
-				getH2().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__H3:
-				getH3().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__H4:
-				getH4().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__H5:
-				getH5().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__H6:
-				getH6().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__UL:
-				getUl().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__OL:
-				getOl().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__DL:
-				getDl().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__P:
-				getP().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__DIV:
-				getDiv().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__PRE:
-				getPre().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__BLOCKQUOTE:
-				getBlockquote().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__ADDRESS:
-				getAddress().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__HR:
-				getHr().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__TABLE:
-				getTable().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_LI_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_LI_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__XHTML_FLOW_MIX:
+			getXhtmlFlowMix().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__H1:
+			getH1().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__H2:
+			getH2().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__H3:
+			getH3().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__H4:
+			getH4().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__H5:
+			getH5().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__H6:
+			getH6().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__UL:
+			getUl().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__OL:
+			getOl().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__DL:
+			getDl().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__P:
+			getP().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__DIV:
+			getDiv().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__PRE:
+			getPre().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__BLOCKQUOTE:
+			getBlockquote().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__ADDRESS:
+			getAddress().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__HR:
+			getHr().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__TABLE:
+			getTable().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_LI_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_LI_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__XHTML_FLOW_MIX:
-				return !getXhtmlFlowMix().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__H1:
-				return !getH1().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__H2:
-				return !getH2().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__H3:
-				return !getH3().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__H4:
-				return !getH4().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__H5:
-				return !getH5().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__H6:
-				return !getH6().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__UL:
-				return !getUl().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__OL:
-				return !getOl().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__DL:
-				return !getDl().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__P:
-				return !getP().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__DIV:
-				return !getDiv().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__PRE:
-				return !getPre().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__BLOCKQUOTE:
-				return !getBlockquote().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__ADDRESS:
-				return !getAddress().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__HR:
-				return !getHr().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__TABLE:
-				return !getTable().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_LI_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_LI_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_LI_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_LI_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_LI_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_LI_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_LI_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__XHTML_FLOW_MIX:
+			return !getXhtmlFlowMix().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__H1:
+			return !getH1().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__H2:
+			return !getH2().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__H3:
+			return !getH3().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__H4:
+			return !getH4().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__H5:
+			return !getH5().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__H6:
+			return !getH6().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__UL:
+			return !getUl().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__OL:
+			return !getOl().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__DL:
+			return !getDl().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__P:
+			return !getP().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__DIV:
+			return !getDiv().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__PRE:
+			return !getPre().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__BLOCKQUOTE:
+			return !getBlockquote().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__ADDRESS:
+			return !getAddress().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__HR:
+			return !getHr().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__TABLE:
+			return !getTable().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_LI_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_LI_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_LI_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_LI_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_LI_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_LI_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlLiTypeImpl
+} // XhtmlLiTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlObjectTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlObjectTypeImpl.java
index bb34b21..be4c6e8 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlObjectTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlObjectTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,27 +12,20 @@
 package org.eclipse.rmf.reqif10.xhtml.impl;
 
 import java.math.BigInteger;
-
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.DeclareType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
@@ -71,83 +64,81 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Object Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Object Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getParam <em>Param</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getH1 <em>H1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getH2 <em>H2</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getH3 <em>H3</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getH4 <em>H4</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getH5 <em>H5</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getH6 <em>H6</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getUl <em>Ul</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getOl <em>Ol</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getDl <em>Dl</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getPre <em>Pre</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getBlockquote <em>Blockquote</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getHr <em>Hr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getArchive <em>Archive</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getClassid <em>Classid</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getCodebase <em>Codebase</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getCodetype <em>Codetype</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getData <em>Data</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getDeclare <em>Declare</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getHeight <em>Height</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getStandby <em>Standby</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getTabindex <em>Tabindex</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getGroup <em>Group</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getParam <em>Param</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getH1 <em>H1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getH2 <em>H2</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getH3 <em>H3</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getH4 <em>H4</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getH5 <em>H5</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getH6 <em>H6</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getUl <em>Ul</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getOl <em>Ol</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getDl <em>Dl</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getPre <em>Pre</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getBlockquote <em>Blockquote</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getAddress <em>Address</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getHr <em>Hr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getArchive <em>Archive</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getClassid <em>Classid</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getCodebase <em>Codebase</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getCodetype <em>Codetype</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getData <em>Data</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getDeclare <em>Declare</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getHeight <em>Height</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getStandby <em>Standby</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getTabindex <em>Tabindex</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlObjectTypeImpl#getWidth <em>Width</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlObjectTypeImpl extends EObjectImpl implements XhtmlObjectType {
+public class XhtmlObjectTypeImpl extends MinimalEObjectImpl implements XhtmlObjectType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -155,9 +146,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getArchive() <em>Archive</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getArchive() <em>Archive</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getArchive()
 	 * @generated
 	 * @ordered
@@ -165,9 +156,9 @@
 	protected static final List<String> ARCHIVE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getArchive() <em>Archive</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getArchive() <em>Archive</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getArchive()
 	 * @generated
 	 * @ordered
@@ -175,9 +166,9 @@
 	protected List<String> archive = ARCHIVE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -185,9 +176,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -195,9 +186,9 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClassid() <em>Classid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClassid() <em>Classid</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClassid()
 	 * @generated
 	 * @ordered
@@ -205,9 +196,9 @@
 	protected static final String CLASSID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClassid() <em>Classid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClassid() <em>Classid</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClassid()
 	 * @generated
 	 * @ordered
@@ -215,9 +206,9 @@
 	protected String classid = CLASSID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCodebase() <em>Codebase</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCodebase() <em>Codebase</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCodebase()
 	 * @generated
 	 * @ordered
@@ -225,9 +216,9 @@
 	protected static final String CODEBASE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCodebase() <em>Codebase</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCodebase() <em>Codebase</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCodebase()
 	 * @generated
 	 * @ordered
@@ -235,9 +226,9 @@
 	protected String codebase = CODEBASE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCodetype() <em>Codetype</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCodetype() <em>Codetype</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCodetype()
 	 * @generated
 	 * @ordered
@@ -245,9 +236,9 @@
 	protected static final String CODETYPE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCodetype() <em>Codetype</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCodetype() <em>Codetype</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCodetype()
 	 * @generated
 	 * @ordered
@@ -255,9 +246,9 @@
 	protected String codetype = CODETYPE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getData() <em>Data</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getData() <em>Data</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getData()
 	 * @generated
 	 * @ordered
@@ -265,9 +256,9 @@
 	protected static final String DATA_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getData() <em>Data</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getData() <em>Data</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getData()
 	 * @generated
 	 * @ordered
@@ -275,9 +266,9 @@
 	protected String data = DATA_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDeclare() <em>Declare</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getDeclare() <em>Declare</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getDeclare()
 	 * @generated
 	 * @ordered
@@ -285,9 +276,9 @@
 	protected static final DeclareType DECLARE_EDEFAULT = DeclareType.DECLARE;
 
 	/**
-	 * The cached value of the '{@link #getDeclare() <em>Declare</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDeclare() <em>Declare</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getDeclare()
 	 * @generated
 	 * @ordered
@@ -295,18 +286,17 @@
 	protected DeclareType declare = DECLARE_EDEFAULT;
 
 	/**
-	 * This is true if the Declare attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Declare attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean declareESet;
 
 	/**
-	 * The default value of the '{@link #getHeight() <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getHeight() <em>Height</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getHeight()
 	 * @generated
 	 * @ordered
@@ -314,9 +304,9 @@
 	protected static final Object HEIGHT_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getHeight() <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHeight() <em>Height</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getHeight()
 	 * @generated
 	 * @ordered
@@ -324,9 +314,8 @@
 	protected Object height = HEIGHT_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -334,9 +323,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -344,9 +332,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -354,9 +342,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -364,9 +352,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -374,9 +362,9 @@
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -384,9 +372,9 @@
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -394,9 +382,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -404,18 +392,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStandby() <em>Standby</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStandby() <em>Standby</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStandby()
 	 * @generated
 	 * @ordered
@@ -423,9 +410,9 @@
 	protected static final String STANDBY_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStandby() <em>Standby</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStandby() <em>Standby</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStandby()
 	 * @generated
 	 * @ordered
@@ -433,9 +420,9 @@
 	protected String standby = STANDBY_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -443,9 +430,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -453,9 +440,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTabindex() <em>Tabindex</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTabindex() <em>Tabindex</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTabindex()
 	 * @generated
 	 * @ordered
@@ -463,9 +450,9 @@
 	protected static final BigInteger TABINDEX_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTabindex() <em>Tabindex</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTabindex() <em>Tabindex</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTabindex()
 	 * @generated
 	 * @ordered
@@ -473,9 +460,9 @@
 	protected BigInteger tabindex = TABINDEX_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -483,9 +470,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -493,9 +480,9 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -503,9 +490,9 @@
 	protected static final String TYPE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -513,9 +500,9 @@
 	protected String type = TYPE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -523,9 +510,9 @@
 	protected static final Object WIDTH_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -533,8 +520,8 @@
 	protected Object width = WIDTH_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlObjectTypeImpl() {
@@ -542,8 +529,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -552,8 +539,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -564,17 +551,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getGroup() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Group());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlObjectType_Group());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlParamType> getParam() {
@@ -582,8 +569,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH1Type> getH1() {
@@ -591,8 +578,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH2Type> getH2() {
@@ -600,8 +587,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH3Type> getH3() {
@@ -609,8 +596,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH4Type> getH4() {
@@ -618,8 +605,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH5Type> getH5() {
@@ -627,8 +614,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH6Type> getH6() {
@@ -636,8 +623,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlUlType> getUl() {
@@ -645,8 +632,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlOlType> getOl() {
@@ -654,8 +641,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDlType> getDl() {
@@ -663,8 +650,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlPType> getP() {
@@ -672,8 +659,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDivType> getDiv() {
@@ -681,8 +668,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlPreType> getPre() {
@@ -690,8 +677,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBlockquoteType> getBlockquote() {
@@ -699,8 +686,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAddressType> getAddress() {
@@ -708,8 +695,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlHrType> getHr() {
@@ -717,8 +704,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlTableType> getTable() {
@@ -726,8 +713,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -735,8 +722,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -744,8 +731,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -753,8 +740,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -762,8 +749,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -771,8 +758,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -780,8 +767,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -789,8 +776,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -798,8 +785,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -807,8 +794,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -816,8 +803,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -825,8 +812,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -834,8 +821,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -843,8 +830,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -852,8 +839,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -861,8 +848,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -870,8 +857,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -879,8 +866,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -888,8 +875,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -897,8 +884,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -906,8 +893,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -915,8 +902,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -924,8 +911,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -933,8 +920,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -942,8 +929,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public List<String> getArchive() {
@@ -951,8 +938,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setArchive(List<String> newArchive) {
@@ -963,8 +950,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -972,8 +959,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -984,8 +971,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClassid() {
@@ -993,8 +980,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClassid(String newClassid) {
@@ -1005,8 +992,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getCodebase() {
@@ -1014,8 +1001,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCodebase(String newCodebase) {
@@ -1026,8 +1013,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getCodetype() {
@@ -1035,8 +1022,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCodetype(String newCodetype) {
@@ -1047,8 +1034,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getData() {
@@ -1056,8 +1043,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setData(String newData) {
@@ -1068,8 +1055,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DeclareType getDeclare() {
@@ -1077,8 +1064,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDeclare(DeclareType newDeclare) {
@@ -1091,8 +1078,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDeclare() {
@@ -1101,12 +1088,13 @@
 		declare = DECLARE_EDEFAULT;
 		declareESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_OBJECT_TYPE__DECLARE, oldDeclare, DECLARE_EDEFAULT, oldDeclareESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_OBJECT_TYPE__DECLARE, oldDeclare, DECLARE_EDEFAULT,
+					oldDeclareESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDeclare() {
@@ -1114,8 +1102,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getHeight() {
@@ -1123,8 +1111,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHeight(Object newHeight) {
@@ -1135,8 +1123,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -1144,8 +1132,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -1156,8 +1144,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -1165,8 +1153,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -1177,8 +1165,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -1186,8 +1174,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
@@ -1198,8 +1186,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -1207,8 +1195,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -1221,8 +1209,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -1235,8 +1223,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -1244,8 +1232,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStandby() {
@@ -1253,8 +1241,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStandby(String newStandby) {
@@ -1265,8 +1253,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -1274,8 +1262,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -1286,8 +1274,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger getTabindex() {
@@ -1295,8 +1283,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTabindex(BigInteger newTabindex) {
@@ -1307,8 +1295,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -1316,8 +1304,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -1328,8 +1316,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getType() {
@@ -1337,8 +1325,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(String newType) {
@@ -1349,8 +1337,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getWidth() {
@@ -1358,8 +1346,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setWidth(Object newWidth) {
@@ -1370,855 +1358,864 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_OBJECT_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__GROUP:
-				return ((InternalEList<?>)getGroup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__PARAM:
-				return ((InternalEList<?>)getParam()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H1:
-				return ((InternalEList<?>)getH1()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H2:
-				return ((InternalEList<?>)getH2()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H3:
-				return ((InternalEList<?>)getH3()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H4:
-				return ((InternalEList<?>)getH4()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H5:
-				return ((InternalEList<?>)getH5()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H6:
-				return ((InternalEList<?>)getH6()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__UL:
-				return ((InternalEList<?>)getUl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__OL:
-				return ((InternalEList<?>)getOl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DL:
-				return ((InternalEList<?>)getDl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__P:
-				return ((InternalEList<?>)getP()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DIV:
-				return ((InternalEList<?>)getDiv()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__PRE:
-				return ((InternalEList<?>)getPre()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__BLOCKQUOTE:
-				return ((InternalEList<?>)getBlockquote()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ADDRESS:
-				return ((InternalEList<?>)getAddress()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__HR:
-				return ((InternalEList<?>)getHr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TABLE:
-				return ((InternalEList<?>)getTable()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__GROUP:
+			return ((InternalEList<?>) getGroup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__PARAM:
+			return ((InternalEList<?>) getParam()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H1:
+			return ((InternalEList<?>) getH1()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H2:
+			return ((InternalEList<?>) getH2()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H3:
+			return ((InternalEList<?>) getH3()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H4:
+			return ((InternalEList<?>) getH4()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H5:
+			return ((InternalEList<?>) getH5()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H6:
+			return ((InternalEList<?>) getH6()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__UL:
+			return ((InternalEList<?>) getUl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__OL:
+			return ((InternalEList<?>) getOl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DL:
+			return ((InternalEList<?>) getDl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__P:
+			return ((InternalEList<?>) getP()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DIV:
+			return ((InternalEList<?>) getDiv()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__PRE:
+			return ((InternalEList<?>) getPre()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__BLOCKQUOTE:
+			return ((InternalEList<?>) getBlockquote()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ADDRESS:
+			return ((InternalEList<?>) getAddress()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__HR:
+			return ((InternalEList<?>) getHr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TABLE:
+			return ((InternalEList<?>) getTable()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_OBJECT_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__GROUP:
-				if (coreType) return getGroup();
-				return ((FeatureMap.Internal)getGroup()).getWrapper();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__PARAM:
-				return getParam();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H1:
-				return getH1();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H2:
-				return getH2();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H3:
-				return getH3();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H4:
-				return getH4();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H5:
-				return getH5();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H6:
-				return getH6();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__UL:
-				return getUl();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__OL:
-				return getOl();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DL:
-				return getDl();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__P:
-				return getP();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DIV:
-				return getDiv();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__PRE:
-				return getPre();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__BLOCKQUOTE:
-				return getBlockquote();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ADDRESS:
-				return getAddress();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__HR:
-				return getHr();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TABLE:
-				return getTable();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ARCHIVE:
-				return getArchive();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CLASSID:
-				return getClassid();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CODEBASE:
-				return getCodebase();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CODETYPE:
-				return getCodetype();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DATA:
-				return getData();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DECLARE:
-				return getDeclare();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__HEIGHT:
-				return getHeight();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__NAME:
-				return getName();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__STANDBY:
-				return getStandby();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TABINDEX:
-				return getTabindex();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TITLE:
-				return getTitle();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TYPE:
-				return getType();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__WIDTH:
-				return getWidth();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__GROUP:
+			if (coreType)
+				return getGroup();
+			return ((FeatureMap.Internal) getGroup()).getWrapper();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__PARAM:
+			return getParam();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H1:
+			return getH1();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H2:
+			return getH2();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H3:
+			return getH3();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H4:
+			return getH4();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H5:
+			return getH5();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H6:
+			return getH6();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__UL:
+			return getUl();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__OL:
+			return getOl();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DL:
+			return getDl();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__P:
+			return getP();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DIV:
+			return getDiv();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__PRE:
+			return getPre();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__BLOCKQUOTE:
+			return getBlockquote();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ADDRESS:
+			return getAddress();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__HR:
+			return getHr();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TABLE:
+			return getTable();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ARCHIVE:
+			return getArchive();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CLASSID:
+			return getClassid();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CODEBASE:
+			return getCodebase();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CODETYPE:
+			return getCodetype();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DATA:
+			return getData();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DECLARE:
+			return getDeclare();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__HEIGHT:
+			return getHeight();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__NAME:
+			return getName();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__STANDBY:
+			return getStandby();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TABINDEX:
+			return getTabindex();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TITLE:
+			return getTitle();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TYPE:
+			return getType();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__WIDTH:
+			return getWidth();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_OBJECT_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__GROUP:
-				((FeatureMap.Internal)getGroup()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__PARAM:
-				getParam().clear();
-				getParam().addAll((Collection<? extends XhtmlParamType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H1:
-				getH1().clear();
-				getH1().addAll((Collection<? extends XhtmlH1Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H2:
-				getH2().clear();
-				getH2().addAll((Collection<? extends XhtmlH2Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H3:
-				getH3().clear();
-				getH3().addAll((Collection<? extends XhtmlH3Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H4:
-				getH4().clear();
-				getH4().addAll((Collection<? extends XhtmlH4Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H5:
-				getH5().clear();
-				getH5().addAll((Collection<? extends XhtmlH5Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H6:
-				getH6().clear();
-				getH6().addAll((Collection<? extends XhtmlH6Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__UL:
-				getUl().clear();
-				getUl().addAll((Collection<? extends XhtmlUlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__OL:
-				getOl().clear();
-				getOl().addAll((Collection<? extends XhtmlOlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DL:
-				getDl().clear();
-				getDl().addAll((Collection<? extends XhtmlDlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__P:
-				getP().clear();
-				getP().addAll((Collection<? extends XhtmlPType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DIV:
-				getDiv().clear();
-				getDiv().addAll((Collection<? extends XhtmlDivType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__PRE:
-				getPre().clear();
-				getPre().addAll((Collection<? extends XhtmlPreType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__BLOCKQUOTE:
-				getBlockquote().clear();
-				getBlockquote().addAll((Collection<? extends XhtmlBlockquoteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ADDRESS:
-				getAddress().clear();
-				getAddress().addAll((Collection<? extends XhtmlAddressType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__HR:
-				getHr().clear();
-				getHr().addAll((Collection<? extends XhtmlHrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TABLE:
-				getTable().clear();
-				getTable().addAll((Collection<? extends XhtmlTableType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ARCHIVE:
-				setArchive((List<String>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CLASSID:
-				setClassid((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CODEBASE:
-				setCodebase((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CODETYPE:
-				setCodetype((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DATA:
-				setData((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DECLARE:
-				setDeclare((DeclareType)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__HEIGHT:
-				setHeight(newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__NAME:
-				setName((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__STANDBY:
-				setStandby((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TABINDEX:
-				setTabindex((BigInteger)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TYPE:
-				setType((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__WIDTH:
-				setWidth(newValue);
-				return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__GROUP:
+			((FeatureMap.Internal) getGroup()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__PARAM:
+			getParam().clear();
+			getParam().addAll((Collection<? extends XhtmlParamType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H1:
+			getH1().clear();
+			getH1().addAll((Collection<? extends XhtmlH1Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H2:
+			getH2().clear();
+			getH2().addAll((Collection<? extends XhtmlH2Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H3:
+			getH3().clear();
+			getH3().addAll((Collection<? extends XhtmlH3Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H4:
+			getH4().clear();
+			getH4().addAll((Collection<? extends XhtmlH4Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H5:
+			getH5().clear();
+			getH5().addAll((Collection<? extends XhtmlH5Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H6:
+			getH6().clear();
+			getH6().addAll((Collection<? extends XhtmlH6Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__UL:
+			getUl().clear();
+			getUl().addAll((Collection<? extends XhtmlUlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__OL:
+			getOl().clear();
+			getOl().addAll((Collection<? extends XhtmlOlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DL:
+			getDl().clear();
+			getDl().addAll((Collection<? extends XhtmlDlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__P:
+			getP().clear();
+			getP().addAll((Collection<? extends XhtmlPType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DIV:
+			getDiv().clear();
+			getDiv().addAll((Collection<? extends XhtmlDivType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__PRE:
+			getPre().clear();
+			getPre().addAll((Collection<? extends XhtmlPreType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__BLOCKQUOTE:
+			getBlockquote().clear();
+			getBlockquote().addAll((Collection<? extends XhtmlBlockquoteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ADDRESS:
+			getAddress().clear();
+			getAddress().addAll((Collection<? extends XhtmlAddressType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__HR:
+			getHr().clear();
+			getHr().addAll((Collection<? extends XhtmlHrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TABLE:
+			getTable().clear();
+			getTable().addAll((Collection<? extends XhtmlTableType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ARCHIVE:
+			setArchive((List<String>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CLASSID:
+			setClassid((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CODEBASE:
+			setCodebase((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CODETYPE:
+			setCodetype((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DATA:
+			setData((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DECLARE:
+			setDeclare((DeclareType) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__HEIGHT:
+			setHeight(newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__NAME:
+			setName((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__STANDBY:
+			setStandby((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TABINDEX:
+			setTabindex((BigInteger) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TYPE:
+			setType((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__WIDTH:
+			setWidth(newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_OBJECT_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__GROUP:
-				getGroup().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__PARAM:
-				getParam().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H1:
-				getH1().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H2:
-				getH2().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H3:
-				getH3().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H4:
-				getH4().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H5:
-				getH5().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H6:
-				getH6().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__UL:
-				getUl().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__OL:
-				getOl().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DL:
-				getDl().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__P:
-				getP().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DIV:
-				getDiv().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__PRE:
-				getPre().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__BLOCKQUOTE:
-				getBlockquote().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ADDRESS:
-				getAddress().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__HR:
-				getHr().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TABLE:
-				getTable().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ARCHIVE:
-				setArchive(ARCHIVE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CLASSID:
-				setClassid(CLASSID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CODEBASE:
-				setCodebase(CODEBASE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CODETYPE:
-				setCodetype(CODETYPE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DATA:
-				setData(DATA_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DECLARE:
-				unsetDeclare();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__HEIGHT:
-				setHeight(HEIGHT_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__STANDBY:
-				setStandby(STANDBY_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TABINDEX:
-				setTabindex(TABINDEX_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OBJECT_TYPE__WIDTH:
-				setWidth(WIDTH_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__GROUP:
+			getGroup().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__PARAM:
+			getParam().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H1:
+			getH1().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H2:
+			getH2().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H3:
+			getH3().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H4:
+			getH4().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H5:
+			getH5().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H6:
+			getH6().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__UL:
+			getUl().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__OL:
+			getOl().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DL:
+			getDl().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__P:
+			getP().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DIV:
+			getDiv().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__PRE:
+			getPre().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__BLOCKQUOTE:
+			getBlockquote().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ADDRESS:
+			getAddress().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__HR:
+			getHr().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TABLE:
+			getTable().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ARCHIVE:
+			setArchive(ARCHIVE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CLASSID:
+			setClassid(CLASSID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CODEBASE:
+			setCodebase(CODEBASE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CODETYPE:
+			setCodetype(CODETYPE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DATA:
+			setData(DATA_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DECLARE:
+			unsetDeclare();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__HEIGHT:
+			setHeight(HEIGHT_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__STANDBY:
+			setStandby(STANDBY_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TABINDEX:
+			setTabindex(TABINDEX_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OBJECT_TYPE__WIDTH:
+			setWidth(WIDTH_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_OBJECT_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__GROUP:
-				return !getGroup().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__PARAM:
-				return !getParam().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H1:
-				return !getH1().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H2:
-				return !getH2().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H3:
-				return !getH3().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H4:
-				return !getH4().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H5:
-				return !getH5().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__H6:
-				return !getH6().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__UL:
-				return !getUl().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__OL:
-				return !getOl().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DL:
-				return !getDl().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__P:
-				return !getP().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DIV:
-				return !getDiv().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__PRE:
-				return !getPre().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__BLOCKQUOTE:
-				return !getBlockquote().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ADDRESS:
-				return !getAddress().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__HR:
-				return !getHr().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TABLE:
-				return !getTable().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ARCHIVE:
-				return ARCHIVE_EDEFAULT == null ? archive != null : !ARCHIVE_EDEFAULT.equals(archive);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CLASSID:
-				return CLASSID_EDEFAULT == null ? classid != null : !CLASSID_EDEFAULT.equals(classid);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CODEBASE:
-				return CODEBASE_EDEFAULT == null ? codebase != null : !CODEBASE_EDEFAULT.equals(codebase);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__CODETYPE:
-				return CODETYPE_EDEFAULT == null ? codetype != null : !CODETYPE_EDEFAULT.equals(codetype);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DATA:
-				return DATA_EDEFAULT == null ? data != null : !DATA_EDEFAULT.equals(data);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__DECLARE:
-				return isSetDeclare();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__HEIGHT:
-				return HEIGHT_EDEFAULT == null ? height != null : !HEIGHT_EDEFAULT.equals(height);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_OBJECT_TYPE__STANDBY:
-				return STANDBY_EDEFAULT == null ? standby != null : !STANDBY_EDEFAULT.equals(standby);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TABINDEX:
-				return TABINDEX_EDEFAULT == null ? tabindex != null : !TABINDEX_EDEFAULT.equals(tabindex);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case XhtmlPackage.XHTML_OBJECT_TYPE__WIDTH:
-				return WIDTH_EDEFAULT == null ? width != null : !WIDTH_EDEFAULT.equals(width);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__GROUP:
+			return !getGroup().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__PARAM:
+			return !getParam().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H1:
+			return !getH1().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H2:
+			return !getH2().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H3:
+			return !getH3().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H4:
+			return !getH4().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H5:
+			return !getH5().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__H6:
+			return !getH6().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__UL:
+			return !getUl().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__OL:
+			return !getOl().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DL:
+			return !getDl().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__P:
+			return !getP().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DIV:
+			return !getDiv().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__PRE:
+			return !getPre().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__BLOCKQUOTE:
+			return !getBlockquote().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ADDRESS:
+			return !getAddress().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__HR:
+			return !getHr().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TABLE:
+			return !getTable().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ARCHIVE:
+			return ARCHIVE_EDEFAULT == null ? archive != null : !ARCHIVE_EDEFAULT.equals(archive);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CLASSID:
+			return CLASSID_EDEFAULT == null ? classid != null : !CLASSID_EDEFAULT.equals(classid);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CODEBASE:
+			return CODEBASE_EDEFAULT == null ? codebase != null : !CODEBASE_EDEFAULT.equals(codebase);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__CODETYPE:
+			return CODETYPE_EDEFAULT == null ? codetype != null : !CODETYPE_EDEFAULT.equals(codetype);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DATA:
+			return DATA_EDEFAULT == null ? data != null : !DATA_EDEFAULT.equals(data);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__DECLARE:
+			return isSetDeclare();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__HEIGHT:
+			return HEIGHT_EDEFAULT == null ? height != null : !HEIGHT_EDEFAULT.equals(height);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_OBJECT_TYPE__STANDBY:
+			return STANDBY_EDEFAULT == null ? standby != null : !STANDBY_EDEFAULT.equals(standby);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TABINDEX:
+			return TABINDEX_EDEFAULT == null ? tabindex != null : !TABINDEX_EDEFAULT.equals(tabindex);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case XhtmlPackage.XHTML_OBJECT_TYPE__WIDTH:
+			return WIDTH_EDEFAULT == null ? width != null : !WIDTH_EDEFAULT.equals(width);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", archive: ");
+		result.append(", archive: "); //$NON-NLS-1$
 		result.append(archive);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", classid: ");
+		result.append(", classid: "); //$NON-NLS-1$
 		result.append(classid);
-		result.append(", codebase: ");
+		result.append(", codebase: "); //$NON-NLS-1$
 		result.append(codebase);
-		result.append(", codetype: ");
+		result.append(", codetype: "); //$NON-NLS-1$
 		result.append(codetype);
-		result.append(", data: ");
+		result.append(", data: "); //$NON-NLS-1$
 		result.append(data);
-		result.append(", declare: ");
-		if (declareESet) result.append(declare); else result.append("<unset>");
-		result.append(", height: ");
+		result.append(", declare: "); //$NON-NLS-1$
+		if (declareESet)
+			result.append(declare);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", height: "); //$NON-NLS-1$
 		result.append(height);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", name: ");
+		result.append(", name: "); //$NON-NLS-1$
 		result.append(name);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", standby: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", standby: "); //$NON-NLS-1$
 		result.append(standby);
-		result.append(", style: ");
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", tabindex: ");
+		result.append(", tabindex: "); //$NON-NLS-1$
 		result.append(tabindex);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
-		result.append(", type: ");
+		result.append(", type: "); //$NON-NLS-1$
 		result.append(type);
-		result.append(", width: ");
+		result.append(", width: "); //$NON-NLS-1$
 		result.append(width);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlObjectTypeImpl
+} // XhtmlObjectTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlOlTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlOlTypeImpl.java
index 82e4bc3..871a0df 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlOlTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlOlTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,48 +15,40 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlLiType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlOlType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Ol Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Ol Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlOlTypeImpl#getLi <em>Li</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlOlTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlOlTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlOlTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlOlTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlOlTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlOlTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlOlTypeImpl#getLi <em>Li</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlOlTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlOlTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlOlTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlOlTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlOlTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlOlTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlOlTypeImpl extends EObjectImpl implements XhtmlOlType {
+public class XhtmlOlTypeImpl extends MinimalEObjectImpl implements XhtmlOlType {
 	/**
-	 * The cached value of the '{@link #getLi() <em>Li</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLi() <em>Li</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getLi()
 	 * @generated
 	 * @ordered
@@ -64,9 +56,9 @@
 	protected EList<XhtmlLiType> li;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -74,9 +66,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -84,9 +76,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -94,9 +85,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -104,9 +94,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -114,9 +104,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -124,9 +114,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -134,9 +124,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -144,18 +134,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -163,9 +152,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -173,9 +162,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -183,9 +172,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -193,8 +182,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlOlTypeImpl() {
@@ -202,8 +191,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -212,8 +201,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlLiType> getLi() {
@@ -224,8 +213,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -233,8 +222,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -245,8 +234,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -254,8 +243,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -266,8 +255,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -275,8 +264,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -287,8 +276,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -296,8 +285,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -310,8 +299,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -324,8 +313,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -333,8 +322,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -342,8 +331,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -354,8 +343,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -363,8 +352,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -375,163 +364,167 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_OL_TYPE__LI:
-				return ((InternalEList<?>)getLi()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_OL_TYPE__LI:
+			return ((InternalEList<?>) getLi()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_OL_TYPE__LI:
-				return getLi();
-			case XhtmlPackage.XHTML_OL_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_OL_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_OL_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_OL_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_OL_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_OL_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_OL_TYPE__LI:
+			return getLi();
+		case XhtmlPackage.XHTML_OL_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_OL_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_OL_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_OL_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_OL_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_OL_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_OL_TYPE__LI:
-				getLi().clear();
-				getLi().addAll((Collection<? extends XhtmlLiType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_OL_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_OL_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_OL_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_OL_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_OL_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_OL_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_OL_TYPE__LI:
+			getLi().clear();
+			getLi().addAll((Collection<? extends XhtmlLiType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_OL_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_OL_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_OL_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_OL_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_OL_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_OL_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_OL_TYPE__LI:
-				getLi().clear();
-				return;
-			case XhtmlPackage.XHTML_OL_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OL_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OL_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OL_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_OL_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_OL_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_OL_TYPE__LI:
+			getLi().clear();
+			return;
+		case XhtmlPackage.XHTML_OL_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OL_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OL_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OL_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_OL_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_OL_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_OL_TYPE__LI:
-				return li != null && !li.isEmpty();
-			case XhtmlPackage.XHTML_OL_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_OL_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_OL_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_OL_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_OL_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_OL_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_OL_TYPE__LI:
+			return li != null && !li.isEmpty();
+		case XhtmlPackage.XHTML_OL_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_OL_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_OL_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_OL_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_OL_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_OL_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (class: ");
+		result.append(" (class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlOlTypeImpl
+} // XhtmlOlTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlPTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlPTypeImpl.java
index c048bbb..168e668 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlPTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlPTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -51,54 +45,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>PType</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>PType</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlPTypeImpl extends EObjectImpl implements XhtmlPType {
+public class XhtmlPTypeImpl extends MinimalEObjectImpl implements XhtmlPType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -106,9 +98,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -116,9 +108,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -126,9 +118,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -136,9 +127,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -146,9 +136,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -156,9 +146,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -166,9 +156,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -176,9 +166,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -186,18 +176,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -205,9 +194,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -215,9 +204,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -225,9 +214,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -235,8 +224,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlPTypeImpl() {
@@ -244,8 +233,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -254,8 +243,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -266,17 +255,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlPType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlPType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -284,8 +273,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -293,8 +282,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -302,8 +291,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -311,8 +300,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -320,8 +309,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -329,8 +318,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -338,8 +327,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -347,8 +336,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -356,8 +345,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -365,8 +354,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -374,8 +363,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -383,8 +372,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -392,8 +381,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -401,8 +390,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -410,8 +399,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -419,8 +408,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -428,8 +417,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -437,8 +426,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -446,8 +435,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -455,8 +444,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -464,8 +453,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -473,8 +462,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -482,8 +471,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -491,8 +480,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -500,8 +489,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -512,8 +501,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -521,8 +510,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -533,8 +522,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -542,8 +531,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -554,8 +543,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -563,8 +552,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -577,8 +566,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -591,8 +580,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -600,8 +589,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -609,8 +598,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -621,8 +610,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -630,8 +619,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -642,490 +631,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_PTYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PTYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PTYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_PTYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_PTYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_PTYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_PTYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_PTYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_PTYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_PTYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_PTYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_PTYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_PTYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_PTYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_PTYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_PTYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_PTYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_PTYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_PTYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_PTYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_PTYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_PTYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_PTYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_PTYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_PTYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_PTYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_PTYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_PTYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_PTYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_PTYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_PTYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_PTYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_PTYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_PTYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_PTYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_PTYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_PTYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_PTYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_PTYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_PTYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_PTYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_PTYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_PTYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_PTYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_PTYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_PTYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_PTYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_PTYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_PTYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_PTYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_PTYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_PTYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_PTYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_PTYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_PTYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_PTYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_PTYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_PTYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_PTYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_PTYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_PTYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_PTYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_PTYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_PTYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_PTYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_PTYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_PTYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_PTYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_PTYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_PTYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_PTYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_PTYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_PTYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_PTYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_PTYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_PTYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_PTYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_PTYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_PTYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_PTYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_PTYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_PTYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_PTYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_PTYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_PTYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_PTYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_PTYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_PTYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_PTYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlPTypeImpl
+} // XhtmlPTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlPackageImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlPackageImpl.java
index 74e936e..e103dfa 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlPackageImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlPackageImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,12 +12,10 @@
 package org.eclipse.rmf.reqif10.xhtml.impl;
 
 import java.io.IOException;
-
 import java.net.URL;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.common.util.WrappedException;
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
@@ -25,482 +23,471 @@
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
-
 import org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage;
-
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
 import org.eclipse.rmf.reqif10.datatypes.DatatypesPackage;
-
 import org.eclipse.rmf.reqif10.datatypes.impl.DatatypesPackageImpl;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlFactory;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class XhtmlPackageImpl extends EPackageImpl implements XhtmlPackage {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected String packageFilename = "xhtml.ecore";
+	protected String packageFilename = "xhtml.ecore"; //$NON-NLS-1$
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass documentRootEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlAbbrTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlAcronymTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlAddressTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlATypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlBlockquoteTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlBrTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlCaptionTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlCiteTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlCodeTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlColgroupTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlColTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlDdTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlDfnTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlDivTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlDlTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlDtTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlEditTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlEmTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlH1TypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlH2TypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlH3TypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlH4TypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlH5TypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlH6TypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlHeadingTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlHrTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlInlPresTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlKbdTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlLiTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlObjectTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlOlTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlParamTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlPreTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlPTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlQTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlSampTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlSpanTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlStrongTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlTableTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlTbodyTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlTdTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlTfootTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlTheadTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlThTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlTrTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlUlTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass xhtmlVarTypeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum alignTypeEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum declareTypeEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum frameTypeEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum rulesTypeEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum scopeTypeEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum valignTypeEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum valuetypeTypeEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType alignTypeObjectEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType declareTypeObjectEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType frameTypeObjectEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType rulesTypeObjectEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType scopeTypeObjectEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType valignTypeObjectEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType valuetypeTypeObjectEDataType = null;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry
+	 * EPackage.Registry} by the package package URI value.
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
+	 * performs initialization of the package, or returns the registered package, if one already exists. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage#eNS_URI
 	 * @see #init()
@@ -511,27 +498,30 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link XhtmlPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link XhtmlPackage#eINSTANCE} when that field is accessed. Clients should not
+	 * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @generated
 	 */
 	public static XhtmlPackage init() {
-		if (isInited) return (XhtmlPackage)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI);
+		if (isInited) {
+			return (XhtmlPackage) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI);
+		}
 
 		// Obtain or create and register package
-		XhtmlPackageImpl theXhtmlPackage = (XhtmlPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof XhtmlPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new XhtmlPackageImpl());
+		XhtmlPackageImpl theXhtmlPackage = (XhtmlPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof XhtmlPackageImpl ? EPackage.Registry.INSTANCE
+				.get(eNS_URI) : new XhtmlPackageImpl());
 
 		isInited = true;
 
@@ -541,7 +531,8 @@
 		XMLNamespacePackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
-		DatatypesPackageImpl theDatatypesPackage = (DatatypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(DatatypesPackage.eNS_URI) instanceof DatatypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(DatatypesPackage.eNS_URI) : DatatypesPackage.eINSTANCE);
+		DatatypesPackageImpl theDatatypesPackage = (DatatypesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(DatatypesPackage.eNS_URI) instanceof DatatypesPackageImpl ? EPackage.Registry.INSTANCE
+				.getEPackage(DatatypesPackage.eNS_URI) : DatatypesPackage.eINSTANCE);
 
 		// Load packages
 		theXhtmlPackage.loadPackage();
@@ -558,13151 +549,13150 @@
 		// Mark meta-data to indicate it can't be changed
 		theXhtmlPackage.freeze();
 
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(XhtmlPackage.eNS_URI, theXhtmlPackage);
 		return theXhtmlPackage;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDocumentRoot() {
 		if (documentRootEClass == null) {
-			documentRootEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(4);
+			documentRootEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(4);
 		}
 		return documentRootEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Mixed() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(0);
+		return (EAttribute) getDocumentRoot().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDocumentRoot_XMLNSPrefixMap() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(1);
+		return (EReference) getDocumentRoot().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDocumentRoot_XSISchemaLocation() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(2);
+		return (EReference) getDocumentRoot().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Div() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(3);
+		return (EReference) getDocumentRoot().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDocumentRoot_P() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(4);
+		return (EReference) getDocumentRoot().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Class() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(5);
+		return (EAttribute) getDocumentRoot().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Id() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(6);
+		return (EAttribute) getDocumentRoot().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Title() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(7);
+		return (EAttribute) getDocumentRoot().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlAbbrType() {
 		if (xhtmlAbbrTypeEClass == null) {
-			xhtmlAbbrTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(15);
+			xhtmlAbbrTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(15);
 		}
 		return xhtmlAbbrTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAbbrType_Mixed() {
-        return (EAttribute)getXhtmlAbbrType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlAbbrType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAbbrType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlAbbrType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlAbbrType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Br() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Span() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Em() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Strong() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Dfn() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Code() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Samp() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Kbd() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Var() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Cite() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Abbr() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Acronym() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Q() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Tt() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_I() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_B() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Big() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Small() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Sub() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Sup() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_A() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Object() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Ins() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAbbrType_Del() {
-        return (EReference)getXhtmlAbbrType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlAbbrType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAbbrType_Class() {
-        return (EAttribute)getXhtmlAbbrType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlAbbrType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAbbrType_Id() {
-        return (EAttribute)getXhtmlAbbrType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlAbbrType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAbbrType_Lang() {
-        return (EAttribute)getXhtmlAbbrType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlAbbrType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAbbrType_Space() {
-        return (EAttribute)getXhtmlAbbrType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlAbbrType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAbbrType_Style() {
-        return (EAttribute)getXhtmlAbbrType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlAbbrType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAbbrType_Title() {
-        return (EAttribute)getXhtmlAbbrType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlAbbrType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlAcronymType() {
 		if (xhtmlAcronymTypeEClass == null) {
-			xhtmlAcronymTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(16);
+			xhtmlAcronymTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(16);
 		}
 		return xhtmlAcronymTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAcronymType_Mixed() {
-        return (EAttribute)getXhtmlAcronymType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlAcronymType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAcronymType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlAcronymType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlAcronymType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Br() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Span() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Em() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Strong() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Dfn() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Code() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Samp() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Kbd() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Var() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Cite() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Abbr() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Acronym() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Q() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Tt() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_I() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_B() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Big() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Small() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Sub() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Sup() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_A() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Object() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Ins() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAcronymType_Del() {
-        return (EReference)getXhtmlAcronymType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlAcronymType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAcronymType_Class() {
-        return (EAttribute)getXhtmlAcronymType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlAcronymType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAcronymType_Id() {
-        return (EAttribute)getXhtmlAcronymType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlAcronymType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAcronymType_Lang() {
-        return (EAttribute)getXhtmlAcronymType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlAcronymType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAcronymType_Space() {
-        return (EAttribute)getXhtmlAcronymType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlAcronymType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAcronymType_Style() {
-        return (EAttribute)getXhtmlAcronymType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlAcronymType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAcronymType_Title() {
-        return (EAttribute)getXhtmlAcronymType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlAcronymType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlAddressType() {
 		if (xhtmlAddressTypeEClass == null) {
-			xhtmlAddressTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(17);
+			xhtmlAddressTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(17);
 		}
 		return xhtmlAddressTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAddressType_Mixed() {
-        return (EAttribute)getXhtmlAddressType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlAddressType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAddressType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlAddressType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlAddressType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Br() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Span() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Em() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Strong() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Dfn() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Code() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Samp() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Kbd() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Var() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Cite() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Abbr() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Acronym() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Q() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Tt() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_I() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_B() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Big() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Small() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Sub() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Sup() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_A() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Object() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Ins() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAddressType_Del() {
-        return (EReference)getXhtmlAddressType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlAddressType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAddressType_Class() {
-        return (EAttribute)getXhtmlAddressType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlAddressType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAddressType_Id() {
-        return (EAttribute)getXhtmlAddressType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlAddressType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAddressType_Lang() {
-        return (EAttribute)getXhtmlAddressType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlAddressType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAddressType_Space() {
-        return (EAttribute)getXhtmlAddressType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlAddressType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAddressType_Style() {
-        return (EAttribute)getXhtmlAddressType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlAddressType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAddressType_Title() {
-        return (EAttribute)getXhtmlAddressType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlAddressType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlAType() {
 		if (xhtmlATypeEClass == null) {
-			xhtmlATypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(18);
+			xhtmlATypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(18);
 		}
 		return xhtmlATypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAType_Mixed() {
-        return (EAttribute)getXhtmlAType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlAType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAType_XhtmlInlNoAnchorMix() {
-        return (EAttribute)getXhtmlAType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlAType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Br() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Span() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Em() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Strong() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Dfn() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Code() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Samp() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Kbd() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Var() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Cite() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Abbr() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Acronym() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Q() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Tt() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_I() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_B() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Big() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Small() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Sub() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Sup() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Object() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Ins() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlAType_Del() {
-        return (EReference)getXhtmlAType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlAType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAType_Accesskey() {
-        return (EAttribute)getXhtmlAType().getEStructuralFeatures().get(25);
+		return (EAttribute) getXhtmlAType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAType_Charset() {
-        return (EAttribute)getXhtmlAType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlAType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAType_Class() {
-        return (EAttribute)getXhtmlAType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlAType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAType_Href() {
-        return (EAttribute)getXhtmlAType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlAType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAType_Hreflang() {
-        return (EAttribute)getXhtmlAType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlAType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAType_Id() {
-        return (EAttribute)getXhtmlAType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlAType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAType_Lang() {
-        return (EAttribute)getXhtmlAType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlAType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAType_Rel() {
-        return (EAttribute)getXhtmlAType().getEStructuralFeatures().get(32);
+		return (EAttribute) getXhtmlAType().getEStructuralFeatures().get(32);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAType_Rev() {
-        return (EAttribute)getXhtmlAType().getEStructuralFeatures().get(33);
+		return (EAttribute) getXhtmlAType().getEStructuralFeatures().get(33);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAType_Space() {
-        return (EAttribute)getXhtmlAType().getEStructuralFeatures().get(34);
+		return (EAttribute) getXhtmlAType().getEStructuralFeatures().get(34);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAType_Style() {
-        return (EAttribute)getXhtmlAType().getEStructuralFeatures().get(35);
+		return (EAttribute) getXhtmlAType().getEStructuralFeatures().get(35);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAType_Tabindex() {
-        return (EAttribute)getXhtmlAType().getEStructuralFeatures().get(36);
+		return (EAttribute) getXhtmlAType().getEStructuralFeatures().get(36);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAType_Title() {
-        return (EAttribute)getXhtmlAType().getEStructuralFeatures().get(37);
+		return (EAttribute) getXhtmlAType().getEStructuralFeatures().get(37);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlAType_Type() {
-        return (EAttribute)getXhtmlAType().getEStructuralFeatures().get(38);
+		return (EAttribute) getXhtmlAType().getEStructuralFeatures().get(38);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlBlockquoteType() {
 		if (xhtmlBlockquoteTypeEClass == null) {
-			xhtmlBlockquoteTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(19);
+			xhtmlBlockquoteTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(19);
 		}
 		return xhtmlBlockquoteTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlBlockquoteType_XhtmlBlockMix() {
-        return (EAttribute)getXhtmlBlockquoteType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlBlockquoteType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_H1() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(1);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_H2() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_H3() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_H4() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_H5() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_H6() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_Ul() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_Ol() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_Dl() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_P() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_Div() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_Pre() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_Blockquote() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_Address() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_Hr() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_Table() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_Ins() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlBlockquoteType_Del() {
-        return (EReference)getXhtmlBlockquoteType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlBlockquoteType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlBlockquoteType_Cite() {
-        return (EAttribute)getXhtmlBlockquoteType().getEStructuralFeatures().get(19);
+		return (EAttribute) getXhtmlBlockquoteType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlBlockquoteType_Class() {
-        return (EAttribute)getXhtmlBlockquoteType().getEStructuralFeatures().get(20);
+		return (EAttribute) getXhtmlBlockquoteType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlBlockquoteType_Id() {
-        return (EAttribute)getXhtmlBlockquoteType().getEStructuralFeatures().get(21);
+		return (EAttribute) getXhtmlBlockquoteType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlBlockquoteType_Lang() {
-        return (EAttribute)getXhtmlBlockquoteType().getEStructuralFeatures().get(22);
+		return (EAttribute) getXhtmlBlockquoteType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlBlockquoteType_Space() {
-        return (EAttribute)getXhtmlBlockquoteType().getEStructuralFeatures().get(23);
+		return (EAttribute) getXhtmlBlockquoteType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlBlockquoteType_Style() {
-        return (EAttribute)getXhtmlBlockquoteType().getEStructuralFeatures().get(24);
+		return (EAttribute) getXhtmlBlockquoteType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlBlockquoteType_Title() {
-        return (EAttribute)getXhtmlBlockquoteType().getEStructuralFeatures().get(25);
+		return (EAttribute) getXhtmlBlockquoteType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlBrType() {
 		if (xhtmlBrTypeEClass == null) {
-			xhtmlBrTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(20);
+			xhtmlBrTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(20);
 		}
 		return xhtmlBrTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlBrType_Class() {
-        return (EAttribute)getXhtmlBrType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlBrType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlBrType_Id() {
-        return (EAttribute)getXhtmlBrType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlBrType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlBrType_Space() {
-        return (EAttribute)getXhtmlBrType().getEStructuralFeatures().get(2);
+		return (EAttribute) getXhtmlBrType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlBrType_Title() {
-        return (EAttribute)getXhtmlBrType().getEStructuralFeatures().get(3);
+		return (EAttribute) getXhtmlBrType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlCaptionType() {
 		if (xhtmlCaptionTypeEClass == null) {
-			xhtmlCaptionTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(21);
+			xhtmlCaptionTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(21);
 		}
 		return xhtmlCaptionTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCaptionType_Mixed() {
-        return (EAttribute)getXhtmlCaptionType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlCaptionType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCaptionType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlCaptionType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlCaptionType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Br() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Span() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Em() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Strong() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Dfn() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Code() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Samp() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Kbd() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Var() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Cite() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Abbr() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Acronym() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Q() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Tt() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_I() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_B() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Big() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Small() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Sub() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Sup() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_A() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Object() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Ins() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCaptionType_Del() {
-        return (EReference)getXhtmlCaptionType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlCaptionType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCaptionType_Class() {
-        return (EAttribute)getXhtmlCaptionType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlCaptionType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCaptionType_Id() {
-        return (EAttribute)getXhtmlCaptionType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlCaptionType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCaptionType_Lang() {
-        return (EAttribute)getXhtmlCaptionType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlCaptionType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCaptionType_Space() {
-        return (EAttribute)getXhtmlCaptionType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlCaptionType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCaptionType_Style() {
-        return (EAttribute)getXhtmlCaptionType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlCaptionType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCaptionType_Title() {
-        return (EAttribute)getXhtmlCaptionType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlCaptionType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlCiteType() {
 		if (xhtmlCiteTypeEClass == null) {
-			xhtmlCiteTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(22);
+			xhtmlCiteTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(22);
 		}
 		return xhtmlCiteTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCiteType_Mixed() {
-        return (EAttribute)getXhtmlCiteType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlCiteType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCiteType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlCiteType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlCiteType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Br() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Span() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Em() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Strong() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Dfn() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Code() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Samp() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Kbd() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Var() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Cite() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Abbr() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Acronym() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Q() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Tt() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_I() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_B() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Big() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Small() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Sub() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Sup() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_A() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Object() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Ins() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCiteType_Del() {
-        return (EReference)getXhtmlCiteType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlCiteType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCiteType_Class() {
-        return (EAttribute)getXhtmlCiteType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlCiteType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCiteType_Id() {
-        return (EAttribute)getXhtmlCiteType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlCiteType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCiteType_Lang() {
-        return (EAttribute)getXhtmlCiteType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlCiteType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCiteType_Space() {
-        return (EAttribute)getXhtmlCiteType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlCiteType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCiteType_Style() {
-        return (EAttribute)getXhtmlCiteType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlCiteType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCiteType_Title() {
-        return (EAttribute)getXhtmlCiteType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlCiteType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlCodeType() {
 		if (xhtmlCodeTypeEClass == null) {
-			xhtmlCodeTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(23);
+			xhtmlCodeTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(23);
 		}
 		return xhtmlCodeTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCodeType_Mixed() {
-        return (EAttribute)getXhtmlCodeType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlCodeType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCodeType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlCodeType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlCodeType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Br() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Span() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Em() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Strong() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Dfn() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Code() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Samp() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Kbd() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Var() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Cite() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Abbr() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Acronym() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Q() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Tt() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_I() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_B() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Big() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Small() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Sub() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Sup() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_A() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Object() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Ins() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlCodeType_Del() {
-        return (EReference)getXhtmlCodeType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlCodeType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCodeType_Class() {
-        return (EAttribute)getXhtmlCodeType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlCodeType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCodeType_Id() {
-        return (EAttribute)getXhtmlCodeType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlCodeType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCodeType_Lang() {
-        return (EAttribute)getXhtmlCodeType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlCodeType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCodeType_Space() {
-        return (EAttribute)getXhtmlCodeType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlCodeType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCodeType_Style() {
-        return (EAttribute)getXhtmlCodeType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlCodeType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlCodeType_Title() {
-        return (EAttribute)getXhtmlCodeType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlCodeType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlColgroupType() {
 		if (xhtmlColgroupTypeEClass == null) {
-			xhtmlColgroupTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(24);
+			xhtmlColgroupTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(24);
 		}
 		return xhtmlColgroupTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlColgroupType_Col() {
-        return (EReference)getXhtmlColgroupType().getEStructuralFeatures().get(0);
+		return (EReference) getXhtmlColgroupType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColgroupType_Align() {
-        return (EAttribute)getXhtmlColgroupType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlColgroupType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColgroupType_Char() {
-        return (EAttribute)getXhtmlColgroupType().getEStructuralFeatures().get(2);
+		return (EAttribute) getXhtmlColgroupType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColgroupType_Charoff() {
-        return (EAttribute)getXhtmlColgroupType().getEStructuralFeatures().get(3);
+		return (EAttribute) getXhtmlColgroupType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColgroupType_Class() {
-        return (EAttribute)getXhtmlColgroupType().getEStructuralFeatures().get(4);
+		return (EAttribute) getXhtmlColgroupType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColgroupType_Id() {
-        return (EAttribute)getXhtmlColgroupType().getEStructuralFeatures().get(5);
+		return (EAttribute) getXhtmlColgroupType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColgroupType_Lang() {
-        return (EAttribute)getXhtmlColgroupType().getEStructuralFeatures().get(6);
+		return (EAttribute) getXhtmlColgroupType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColgroupType_Space() {
-        return (EAttribute)getXhtmlColgroupType().getEStructuralFeatures().get(7);
+		return (EAttribute) getXhtmlColgroupType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColgroupType_Span() {
-        return (EAttribute)getXhtmlColgroupType().getEStructuralFeatures().get(8);
+		return (EAttribute) getXhtmlColgroupType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColgroupType_Style() {
-        return (EAttribute)getXhtmlColgroupType().getEStructuralFeatures().get(9);
+		return (EAttribute) getXhtmlColgroupType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColgroupType_Title() {
-        return (EAttribute)getXhtmlColgroupType().getEStructuralFeatures().get(10);
+		return (EAttribute) getXhtmlColgroupType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColgroupType_Valign() {
-        return (EAttribute)getXhtmlColgroupType().getEStructuralFeatures().get(11);
+		return (EAttribute) getXhtmlColgroupType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColgroupType_Width() {
-        return (EAttribute)getXhtmlColgroupType().getEStructuralFeatures().get(12);
+		return (EAttribute) getXhtmlColgroupType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlColType() {
 		if (xhtmlColTypeEClass == null) {
-			xhtmlColTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(25);
+			xhtmlColTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(25);
 		}
 		return xhtmlColTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColType_Align() {
-        return (EAttribute)getXhtmlColType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlColType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColType_Char() {
-        return (EAttribute)getXhtmlColType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlColType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColType_Charoff() {
-        return (EAttribute)getXhtmlColType().getEStructuralFeatures().get(2);
+		return (EAttribute) getXhtmlColType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColType_Class() {
-        return (EAttribute)getXhtmlColType().getEStructuralFeatures().get(3);
+		return (EAttribute) getXhtmlColType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColType_Id() {
-        return (EAttribute)getXhtmlColType().getEStructuralFeatures().get(4);
+		return (EAttribute) getXhtmlColType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColType_Lang() {
-        return (EAttribute)getXhtmlColType().getEStructuralFeatures().get(5);
+		return (EAttribute) getXhtmlColType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColType_Space() {
-        return (EAttribute)getXhtmlColType().getEStructuralFeatures().get(6);
+		return (EAttribute) getXhtmlColType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColType_Span() {
-        return (EAttribute)getXhtmlColType().getEStructuralFeatures().get(7);
+		return (EAttribute) getXhtmlColType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColType_Style() {
-        return (EAttribute)getXhtmlColType().getEStructuralFeatures().get(8);
+		return (EAttribute) getXhtmlColType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColType_Title() {
-        return (EAttribute)getXhtmlColType().getEStructuralFeatures().get(9);
+		return (EAttribute) getXhtmlColType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColType_Valign() {
-        return (EAttribute)getXhtmlColType().getEStructuralFeatures().get(10);
+		return (EAttribute) getXhtmlColType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlColType_Width() {
-        return (EAttribute)getXhtmlColType().getEStructuralFeatures().get(11);
+		return (EAttribute) getXhtmlColType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlDdType() {
 		if (xhtmlDdTypeEClass == null) {
-			xhtmlDdTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(26);
+			xhtmlDdTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(26);
 		}
 		return xhtmlDdTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDdType_Mixed() {
-        return (EAttribute)getXhtmlDdType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlDdType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDdType_XhtmlFlowMix() {
-        return (EAttribute)getXhtmlDdType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlDdType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_H1() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_H2() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_H3() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_H4() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_H5() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_H6() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Ul() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Ol() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Dl() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_P() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Div() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Pre() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Blockquote() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Address() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Hr() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Table() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Br() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Span() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Em() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Strong() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Dfn() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Code() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Samp() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Kbd() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Var() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(26);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Cite() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(27);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Abbr() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(28);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Acronym() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(29);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Q() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(30);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Tt() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(31);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_I() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(32);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(32);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_B() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(33);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(33);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Big() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(34);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(34);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Small() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(35);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(35);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Sub() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(36);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(36);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Sup() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(37);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(37);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_A() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(38);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(38);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Object() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(39);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(39);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Ins() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(40);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(40);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDdType_Del() {
-        return (EReference)getXhtmlDdType().getEStructuralFeatures().get(41);
+		return (EReference) getXhtmlDdType().getEStructuralFeatures().get(41);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDdType_Class() {
-        return (EAttribute)getXhtmlDdType().getEStructuralFeatures().get(42);
+		return (EAttribute) getXhtmlDdType().getEStructuralFeatures().get(42);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDdType_Id() {
-        return (EAttribute)getXhtmlDdType().getEStructuralFeatures().get(43);
+		return (EAttribute) getXhtmlDdType().getEStructuralFeatures().get(43);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDdType_Lang() {
-        return (EAttribute)getXhtmlDdType().getEStructuralFeatures().get(44);
+		return (EAttribute) getXhtmlDdType().getEStructuralFeatures().get(44);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDdType_Space() {
-        return (EAttribute)getXhtmlDdType().getEStructuralFeatures().get(45);
+		return (EAttribute) getXhtmlDdType().getEStructuralFeatures().get(45);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDdType_Style() {
-        return (EAttribute)getXhtmlDdType().getEStructuralFeatures().get(46);
+		return (EAttribute) getXhtmlDdType().getEStructuralFeatures().get(46);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDdType_Title() {
-        return (EAttribute)getXhtmlDdType().getEStructuralFeatures().get(47);
+		return (EAttribute) getXhtmlDdType().getEStructuralFeatures().get(47);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlDfnType() {
 		if (xhtmlDfnTypeEClass == null) {
-			xhtmlDfnTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(27);
+			xhtmlDfnTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(27);
 		}
 		return xhtmlDfnTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDfnType_Mixed() {
-        return (EAttribute)getXhtmlDfnType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlDfnType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDfnType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlDfnType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlDfnType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Br() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Span() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Em() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Strong() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Dfn() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Code() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Samp() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Kbd() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Var() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Cite() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Abbr() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Acronym() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Q() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Tt() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_I() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_B() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Big() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Small() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Sub() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Sup() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_A() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Object() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Ins() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDfnType_Del() {
-        return (EReference)getXhtmlDfnType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlDfnType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDfnType_Class() {
-        return (EAttribute)getXhtmlDfnType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlDfnType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDfnType_Id() {
-        return (EAttribute)getXhtmlDfnType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlDfnType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDfnType_Lang() {
-        return (EAttribute)getXhtmlDfnType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlDfnType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDfnType_Space() {
-        return (EAttribute)getXhtmlDfnType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlDfnType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDfnType_Style() {
-        return (EAttribute)getXhtmlDfnType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlDfnType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDfnType_Title() {
-        return (EAttribute)getXhtmlDfnType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlDfnType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlDivType() {
 		if (xhtmlDivTypeEClass == null) {
-			xhtmlDivTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(28);
+			xhtmlDivTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(28);
 		}
 		return xhtmlDivTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDivType_Mixed() {
-        return (EAttribute)getXhtmlDivType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlDivType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDivType_XhtmlFlowMix() {
-        return (EAttribute)getXhtmlDivType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlDivType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_H1() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_H2() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_H3() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_H4() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_H5() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_H6() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Ul() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Ol() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Dl() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_P() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Div() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Pre() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Blockquote() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Address() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Hr() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Table() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Br() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Span() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Em() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Strong() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Dfn() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Code() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Samp() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Kbd() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Var() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(26);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Cite() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(27);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Abbr() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(28);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Acronym() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(29);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Q() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(30);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Tt() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(31);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_I() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(32);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(32);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_B() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(33);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(33);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Big() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(34);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(34);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Small() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(35);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(35);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Sub() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(36);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(36);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Sup() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(37);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(37);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_A() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(38);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(38);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Object() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(39);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(39);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Ins() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(40);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(40);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDivType_Del() {
-        return (EReference)getXhtmlDivType().getEStructuralFeatures().get(41);
+		return (EReference) getXhtmlDivType().getEStructuralFeatures().get(41);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDivType_Class() {
-        return (EAttribute)getXhtmlDivType().getEStructuralFeatures().get(42);
+		return (EAttribute) getXhtmlDivType().getEStructuralFeatures().get(42);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDivType_Id() {
-        return (EAttribute)getXhtmlDivType().getEStructuralFeatures().get(43);
+		return (EAttribute) getXhtmlDivType().getEStructuralFeatures().get(43);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDivType_Lang() {
-        return (EAttribute)getXhtmlDivType().getEStructuralFeatures().get(44);
+		return (EAttribute) getXhtmlDivType().getEStructuralFeatures().get(44);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDivType_Space() {
-        return (EAttribute)getXhtmlDivType().getEStructuralFeatures().get(45);
+		return (EAttribute) getXhtmlDivType().getEStructuralFeatures().get(45);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDivType_Style() {
-        return (EAttribute)getXhtmlDivType().getEStructuralFeatures().get(46);
+		return (EAttribute) getXhtmlDivType().getEStructuralFeatures().get(46);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDivType_Title() {
-        return (EAttribute)getXhtmlDivType().getEStructuralFeatures().get(47);
+		return (EAttribute) getXhtmlDivType().getEStructuralFeatures().get(47);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlDlType() {
 		if (xhtmlDlTypeEClass == null) {
-			xhtmlDlTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(29);
+			xhtmlDlTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(29);
 		}
 		return xhtmlDlTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDlType_Group() {
-        return (EAttribute)getXhtmlDlType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlDlType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDlType_Dt() {
-        return (EReference)getXhtmlDlType().getEStructuralFeatures().get(1);
+		return (EReference) getXhtmlDlType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDlType_Dd() {
-        return (EReference)getXhtmlDlType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlDlType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDlType_Class() {
-        return (EAttribute)getXhtmlDlType().getEStructuralFeatures().get(3);
+		return (EAttribute) getXhtmlDlType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDlType_Id() {
-        return (EAttribute)getXhtmlDlType().getEStructuralFeatures().get(4);
+		return (EAttribute) getXhtmlDlType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDlType_Lang() {
-        return (EAttribute)getXhtmlDlType().getEStructuralFeatures().get(5);
+		return (EAttribute) getXhtmlDlType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDlType_Space() {
-        return (EAttribute)getXhtmlDlType().getEStructuralFeatures().get(6);
+		return (EAttribute) getXhtmlDlType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDlType_Style() {
-        return (EAttribute)getXhtmlDlType().getEStructuralFeatures().get(7);
+		return (EAttribute) getXhtmlDlType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDlType_Title() {
-        return (EAttribute)getXhtmlDlType().getEStructuralFeatures().get(8);
+		return (EAttribute) getXhtmlDlType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlDtType() {
 		if (xhtmlDtTypeEClass == null) {
-			xhtmlDtTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(30);
+			xhtmlDtTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(30);
 		}
 		return xhtmlDtTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDtType_Mixed() {
-        return (EAttribute)getXhtmlDtType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlDtType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDtType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlDtType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlDtType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Br() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Span() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Em() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Strong() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Dfn() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Code() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Samp() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Kbd() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Var() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Cite() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Abbr() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Acronym() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Q() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Tt() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_I() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_B() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Big() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Small() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Sub() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Sup() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_A() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Object() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Ins() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlDtType_Del() {
-        return (EReference)getXhtmlDtType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlDtType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDtType_Class() {
-        return (EAttribute)getXhtmlDtType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlDtType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDtType_Id() {
-        return (EAttribute)getXhtmlDtType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlDtType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDtType_Lang() {
-        return (EAttribute)getXhtmlDtType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlDtType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDtType_Space() {
-        return (EAttribute)getXhtmlDtType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlDtType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDtType_Style() {
-        return (EAttribute)getXhtmlDtType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlDtType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlDtType_Title() {
-        return (EAttribute)getXhtmlDtType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlDtType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlEditType() {
 		if (xhtmlEditTypeEClass == null) {
-			xhtmlEditTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(31);
+			xhtmlEditTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(31);
 		}
 		return xhtmlEditTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEditType_Mixed() {
-        return (EAttribute)getXhtmlEditType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlEditType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEditType_XhtmlFlowMix() {
-        return (EAttribute)getXhtmlEditType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlEditType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_H1() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_H2() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_H3() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_H4() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_H5() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_H6() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Ul() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Ol() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Dl() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_P() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Div() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Pre() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Blockquote() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Address() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Hr() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Table() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Br() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Span() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Em() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Strong() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Dfn() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Code() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Samp() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Kbd() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Var() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(26);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Cite() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(27);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Abbr() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(28);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Acronym() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(29);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Q() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(30);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Tt() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(31);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_I() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(32);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(32);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_B() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(33);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(33);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Big() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(34);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(34);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Small() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(35);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(35);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Sub() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(36);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(36);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Sup() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(37);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(37);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_A() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(38);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(38);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Object() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(39);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(39);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Ins() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(40);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(40);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEditType_Del() {
-        return (EReference)getXhtmlEditType().getEStructuralFeatures().get(41);
+		return (EReference) getXhtmlEditType().getEStructuralFeatures().get(41);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEditType_Cite1() {
-        return (EAttribute)getXhtmlEditType().getEStructuralFeatures().get(42);
+		return (EAttribute) getXhtmlEditType().getEStructuralFeatures().get(42);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEditType_Class() {
-        return (EAttribute)getXhtmlEditType().getEStructuralFeatures().get(43);
+		return (EAttribute) getXhtmlEditType().getEStructuralFeatures().get(43);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEditType_Datetime() {
-        return (EAttribute)getXhtmlEditType().getEStructuralFeatures().get(44);
+		return (EAttribute) getXhtmlEditType().getEStructuralFeatures().get(44);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEditType_Id() {
-        return (EAttribute)getXhtmlEditType().getEStructuralFeatures().get(45);
+		return (EAttribute) getXhtmlEditType().getEStructuralFeatures().get(45);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEditType_Lang() {
-        return (EAttribute)getXhtmlEditType().getEStructuralFeatures().get(46);
+		return (EAttribute) getXhtmlEditType().getEStructuralFeatures().get(46);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEditType_Space() {
-        return (EAttribute)getXhtmlEditType().getEStructuralFeatures().get(47);
+		return (EAttribute) getXhtmlEditType().getEStructuralFeatures().get(47);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEditType_Style() {
-        return (EAttribute)getXhtmlEditType().getEStructuralFeatures().get(48);
+		return (EAttribute) getXhtmlEditType().getEStructuralFeatures().get(48);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEditType_Title() {
-        return (EAttribute)getXhtmlEditType().getEStructuralFeatures().get(49);
+		return (EAttribute) getXhtmlEditType().getEStructuralFeatures().get(49);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlEmType() {
 		if (xhtmlEmTypeEClass == null) {
-			xhtmlEmTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(32);
+			xhtmlEmTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(32);
 		}
 		return xhtmlEmTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEmType_Mixed() {
-        return (EAttribute)getXhtmlEmType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlEmType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEmType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlEmType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlEmType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Br() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Span() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Em() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Strong() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Dfn() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Code() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Samp() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Kbd() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Var() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Cite() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Abbr() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Acronym() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Q() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Tt() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_I() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_B() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Big() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Small() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Sub() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Sup() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_A() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Object() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Ins() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlEmType_Del() {
-        return (EReference)getXhtmlEmType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlEmType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEmType_Class() {
-        return (EAttribute)getXhtmlEmType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlEmType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEmType_Id() {
-        return (EAttribute)getXhtmlEmType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlEmType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEmType_Lang() {
-        return (EAttribute)getXhtmlEmType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlEmType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEmType_Space() {
-        return (EAttribute)getXhtmlEmType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlEmType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEmType_Style() {
-        return (EAttribute)getXhtmlEmType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlEmType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlEmType_Title() {
-        return (EAttribute)getXhtmlEmType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlEmType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlH1Type() {
 		if (xhtmlH1TypeEClass == null) {
-			xhtmlH1TypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(33);
+			xhtmlH1TypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(33);
 		}
 		return xhtmlH1TypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH1Type_Mixed() {
-        return (EAttribute)getXhtmlH1Type().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlH1Type().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH1Type_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlH1Type().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlH1Type().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Br() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Span() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Em() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Strong() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Dfn() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Code() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Samp() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Kbd() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Var() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Cite() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Abbr() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Acronym() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Q() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Tt() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_I() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_B() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Big() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Small() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Sub() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Sup() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_A() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Object() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Ins() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH1Type_Del() {
-        return (EReference)getXhtmlH1Type().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlH1Type().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH1Type_Class() {
-        return (EAttribute)getXhtmlH1Type().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlH1Type().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH1Type_Id() {
-        return (EAttribute)getXhtmlH1Type().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlH1Type().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH1Type_Lang() {
-        return (EAttribute)getXhtmlH1Type().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlH1Type().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH1Type_Space() {
-        return (EAttribute)getXhtmlH1Type().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlH1Type().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH1Type_Style() {
-        return (EAttribute)getXhtmlH1Type().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlH1Type().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH1Type_Title() {
-        return (EAttribute)getXhtmlH1Type().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlH1Type().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlH2Type() {
 		if (xhtmlH2TypeEClass == null) {
-			xhtmlH2TypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(34);
+			xhtmlH2TypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(34);
 		}
 		return xhtmlH2TypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH2Type_Mixed() {
-        return (EAttribute)getXhtmlH2Type().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlH2Type().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH2Type_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlH2Type().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlH2Type().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Br() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Span() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Em() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Strong() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Dfn() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Code() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Samp() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Kbd() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Var() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Cite() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Abbr() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Acronym() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Q() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Tt() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_I() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_B() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Big() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Small() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Sub() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Sup() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_A() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Object() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Ins() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH2Type_Del() {
-        return (EReference)getXhtmlH2Type().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlH2Type().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH2Type_Class() {
-        return (EAttribute)getXhtmlH2Type().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlH2Type().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH2Type_Id() {
-        return (EAttribute)getXhtmlH2Type().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlH2Type().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH2Type_Lang() {
-        return (EAttribute)getXhtmlH2Type().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlH2Type().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH2Type_Space() {
-        return (EAttribute)getXhtmlH2Type().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlH2Type().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH2Type_Style() {
-        return (EAttribute)getXhtmlH2Type().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlH2Type().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH2Type_Title() {
-        return (EAttribute)getXhtmlH2Type().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlH2Type().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlH3Type() {
 		if (xhtmlH3TypeEClass == null) {
-			xhtmlH3TypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(35);
+			xhtmlH3TypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(35);
 		}
 		return xhtmlH3TypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH3Type_Mixed() {
-        return (EAttribute)getXhtmlH3Type().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlH3Type().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH3Type_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlH3Type().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlH3Type().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Br() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Span() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Em() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Strong() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Dfn() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Code() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Samp() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Kbd() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Var() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Cite() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Abbr() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Acronym() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Q() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Tt() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_I() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_B() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Big() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Small() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Sub() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Sup() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_A() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Object() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Ins() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH3Type_Del() {
-        return (EReference)getXhtmlH3Type().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlH3Type().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH3Type_Class() {
-        return (EAttribute)getXhtmlH3Type().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlH3Type().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH3Type_Id() {
-        return (EAttribute)getXhtmlH3Type().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlH3Type().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH3Type_Lang() {
-        return (EAttribute)getXhtmlH3Type().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlH3Type().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH3Type_Space() {
-        return (EAttribute)getXhtmlH3Type().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlH3Type().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH3Type_Style() {
-        return (EAttribute)getXhtmlH3Type().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlH3Type().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH3Type_Title() {
-        return (EAttribute)getXhtmlH3Type().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlH3Type().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlH4Type() {
 		if (xhtmlH4TypeEClass == null) {
-			xhtmlH4TypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(36);
+			xhtmlH4TypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(36);
 		}
 		return xhtmlH4TypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH4Type_Mixed() {
-        return (EAttribute)getXhtmlH4Type().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlH4Type().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH4Type_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlH4Type().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlH4Type().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Br() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Span() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Em() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Strong() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Dfn() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Code() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Samp() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Kbd() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Var() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Cite() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Abbr() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Acronym() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Q() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Tt() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_I() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_B() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Big() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Small() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Sub() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Sup() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_A() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Object() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Ins() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH4Type_Del() {
-        return (EReference)getXhtmlH4Type().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlH4Type().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH4Type_Class() {
-        return (EAttribute)getXhtmlH4Type().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlH4Type().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH4Type_Id() {
-        return (EAttribute)getXhtmlH4Type().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlH4Type().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH4Type_Lang() {
-        return (EAttribute)getXhtmlH4Type().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlH4Type().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH4Type_Space() {
-        return (EAttribute)getXhtmlH4Type().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlH4Type().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH4Type_Style() {
-        return (EAttribute)getXhtmlH4Type().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlH4Type().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH4Type_Title() {
-        return (EAttribute)getXhtmlH4Type().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlH4Type().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlH5Type() {
 		if (xhtmlH5TypeEClass == null) {
-			xhtmlH5TypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(37);
+			xhtmlH5TypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(37);
 		}
 		return xhtmlH5TypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH5Type_Mixed() {
-        return (EAttribute)getXhtmlH5Type().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlH5Type().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH5Type_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlH5Type().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlH5Type().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Br() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Span() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Em() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Strong() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Dfn() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Code() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Samp() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Kbd() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Var() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Cite() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Abbr() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Acronym() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Q() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Tt() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_I() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_B() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Big() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Small() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Sub() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Sup() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_A() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Object() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Ins() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH5Type_Del() {
-        return (EReference)getXhtmlH5Type().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlH5Type().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH5Type_Class() {
-        return (EAttribute)getXhtmlH5Type().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlH5Type().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH5Type_Id() {
-        return (EAttribute)getXhtmlH5Type().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlH5Type().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH5Type_Lang() {
-        return (EAttribute)getXhtmlH5Type().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlH5Type().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH5Type_Space() {
-        return (EAttribute)getXhtmlH5Type().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlH5Type().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH5Type_Style() {
-        return (EAttribute)getXhtmlH5Type().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlH5Type().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH5Type_Title() {
-        return (EAttribute)getXhtmlH5Type().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlH5Type().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlH6Type() {
 		if (xhtmlH6TypeEClass == null) {
-			xhtmlH6TypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(38);
+			xhtmlH6TypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(38);
 		}
 		return xhtmlH6TypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH6Type_Mixed() {
-        return (EAttribute)getXhtmlH6Type().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlH6Type().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH6Type_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlH6Type().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlH6Type().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Br() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Span() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Em() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Strong() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Dfn() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Code() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Samp() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Kbd() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Var() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Cite() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Abbr() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Acronym() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Q() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Tt() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_I() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_B() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Big() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Small() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Sub() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Sup() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_A() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Object() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Ins() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlH6Type_Del() {
-        return (EReference)getXhtmlH6Type().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlH6Type().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH6Type_Class() {
-        return (EAttribute)getXhtmlH6Type().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlH6Type().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH6Type_Id() {
-        return (EAttribute)getXhtmlH6Type().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlH6Type().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH6Type_Lang() {
-        return (EAttribute)getXhtmlH6Type().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlH6Type().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH6Type_Space() {
-        return (EAttribute)getXhtmlH6Type().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlH6Type().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH6Type_Style() {
-        return (EAttribute)getXhtmlH6Type().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlH6Type().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlH6Type_Title() {
-        return (EAttribute)getXhtmlH6Type().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlH6Type().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlHeadingType() {
 		if (xhtmlHeadingTypeEClass == null) {
-			xhtmlHeadingTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(39);
+			xhtmlHeadingTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(39);
 		}
 		return xhtmlHeadingTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlHeadingType_Mixed() {
-        return (EAttribute)getXhtmlHeadingType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlHeadingType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlHeadingType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlHeadingType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlHeadingType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Br() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Span() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Em() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Strong() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Dfn() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Code() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Samp() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Kbd() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Var() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Cite() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Abbr() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Acronym() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Q() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Tt() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_I() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_B() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Big() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Small() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Sub() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Sup() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_A() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Object() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Ins() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlHeadingType_Del() {
-        return (EReference)getXhtmlHeadingType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlHeadingType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlHeadingType_Class() {
-        return (EAttribute)getXhtmlHeadingType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlHeadingType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlHeadingType_Id() {
-        return (EAttribute)getXhtmlHeadingType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlHeadingType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlHeadingType_Lang() {
-        return (EAttribute)getXhtmlHeadingType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlHeadingType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlHeadingType_Space() {
-        return (EAttribute)getXhtmlHeadingType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlHeadingType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlHeadingType_Style() {
-        return (EAttribute)getXhtmlHeadingType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlHeadingType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlHeadingType_Title() {
-        return (EAttribute)getXhtmlHeadingType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlHeadingType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlHrType() {
 		if (xhtmlHrTypeEClass == null) {
-			xhtmlHrTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(40);
+			xhtmlHrTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(40);
 		}
 		return xhtmlHrTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlHrType_Class() {
-        return (EAttribute)getXhtmlHrType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlHrType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlHrType_Id() {
-        return (EAttribute)getXhtmlHrType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlHrType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlHrType_Lang() {
-        return (EAttribute)getXhtmlHrType().getEStructuralFeatures().get(2);
+		return (EAttribute) getXhtmlHrType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlHrType_Space() {
-        return (EAttribute)getXhtmlHrType().getEStructuralFeatures().get(3);
+		return (EAttribute) getXhtmlHrType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlHrType_Style() {
-        return (EAttribute)getXhtmlHrType().getEStructuralFeatures().get(4);
+		return (EAttribute) getXhtmlHrType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlHrType_Title() {
-        return (EAttribute)getXhtmlHrType().getEStructuralFeatures().get(5);
+		return (EAttribute) getXhtmlHrType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlInlPresType() {
 		if (xhtmlInlPresTypeEClass == null) {
-			xhtmlInlPresTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(41);
+			xhtmlInlPresTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(41);
 		}
 		return xhtmlInlPresTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlInlPresType_Mixed() {
-        return (EAttribute)getXhtmlInlPresType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlInlPresType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlInlPresType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlInlPresType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlInlPresType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Br() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Span() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Em() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Strong() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Dfn() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Code() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Samp() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Kbd() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Var() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Cite() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Abbr() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Acronym() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Q() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Tt() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_I() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_B() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Big() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Small() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Sub() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Sup() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_A() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Object() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Ins() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlInlPresType_Del() {
-        return (EReference)getXhtmlInlPresType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlInlPresType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlInlPresType_Class() {
-        return (EAttribute)getXhtmlInlPresType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlInlPresType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlInlPresType_Id() {
-        return (EAttribute)getXhtmlInlPresType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlInlPresType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlInlPresType_Lang() {
-        return (EAttribute)getXhtmlInlPresType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlInlPresType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlInlPresType_Space() {
-        return (EAttribute)getXhtmlInlPresType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlInlPresType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlInlPresType_Style() {
-        return (EAttribute)getXhtmlInlPresType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlInlPresType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlInlPresType_Title() {
-        return (EAttribute)getXhtmlInlPresType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlInlPresType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlKbdType() {
 		if (xhtmlKbdTypeEClass == null) {
-			xhtmlKbdTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(42);
+			xhtmlKbdTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(42);
 		}
 		return xhtmlKbdTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlKbdType_Mixed() {
-        return (EAttribute)getXhtmlKbdType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlKbdType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlKbdType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlKbdType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlKbdType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Br() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Span() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Em() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Strong() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Dfn() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Code() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Samp() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Kbd() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Var() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Cite() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Abbr() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Acronym() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Q() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Tt() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_I() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_B() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Big() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Small() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Sub() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Sup() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_A() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Object() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Ins() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlKbdType_Del() {
-        return (EReference)getXhtmlKbdType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlKbdType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlKbdType_Class() {
-        return (EAttribute)getXhtmlKbdType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlKbdType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlKbdType_Id() {
-        return (EAttribute)getXhtmlKbdType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlKbdType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlKbdType_Lang() {
-        return (EAttribute)getXhtmlKbdType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlKbdType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlKbdType_Space() {
-        return (EAttribute)getXhtmlKbdType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlKbdType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlKbdType_Style() {
-        return (EAttribute)getXhtmlKbdType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlKbdType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlKbdType_Title() {
-        return (EAttribute)getXhtmlKbdType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlKbdType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlLiType() {
 		if (xhtmlLiTypeEClass == null) {
-			xhtmlLiTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(43);
+			xhtmlLiTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(43);
 		}
 		return xhtmlLiTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlLiType_Mixed() {
-        return (EAttribute)getXhtmlLiType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlLiType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlLiType_XhtmlFlowMix() {
-        return (EAttribute)getXhtmlLiType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlLiType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_H1() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_H2() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_H3() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_H4() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_H5() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_H6() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Ul() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Ol() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Dl() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_P() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Div() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Pre() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Blockquote() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Address() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Hr() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Table() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Br() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Span() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Em() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Strong() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Dfn() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Code() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Samp() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Kbd() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Var() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(26);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Cite() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(27);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Abbr() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(28);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Acronym() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(29);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Q() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(30);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Tt() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(31);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_I() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(32);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(32);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_B() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(33);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(33);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Big() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(34);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(34);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Small() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(35);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(35);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Sub() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(36);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(36);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Sup() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(37);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(37);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_A() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(38);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(38);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Object() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(39);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(39);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Ins() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(40);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(40);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlLiType_Del() {
-        return (EReference)getXhtmlLiType().getEStructuralFeatures().get(41);
+		return (EReference) getXhtmlLiType().getEStructuralFeatures().get(41);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlLiType_Class() {
-        return (EAttribute)getXhtmlLiType().getEStructuralFeatures().get(42);
+		return (EAttribute) getXhtmlLiType().getEStructuralFeatures().get(42);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlLiType_Id() {
-        return (EAttribute)getXhtmlLiType().getEStructuralFeatures().get(43);
+		return (EAttribute) getXhtmlLiType().getEStructuralFeatures().get(43);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlLiType_Lang() {
-        return (EAttribute)getXhtmlLiType().getEStructuralFeatures().get(44);
+		return (EAttribute) getXhtmlLiType().getEStructuralFeatures().get(44);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlLiType_Space() {
-        return (EAttribute)getXhtmlLiType().getEStructuralFeatures().get(45);
+		return (EAttribute) getXhtmlLiType().getEStructuralFeatures().get(45);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlLiType_Style() {
-        return (EAttribute)getXhtmlLiType().getEStructuralFeatures().get(46);
+		return (EAttribute) getXhtmlLiType().getEStructuralFeatures().get(46);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlLiType_Title() {
-        return (EAttribute)getXhtmlLiType().getEStructuralFeatures().get(47);
+		return (EAttribute) getXhtmlLiType().getEStructuralFeatures().get(47);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlObjectType() {
 		if (xhtmlObjectTypeEClass == null) {
-			xhtmlObjectTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(44);
+			xhtmlObjectTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(44);
 		}
 		return xhtmlObjectTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Mixed() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Group() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Param() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_H1() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_H2() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_H3() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_H4() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_H5() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_H6() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Ul() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Ol() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Dl() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_P() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Div() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Pre() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Blockquote() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Address() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Hr() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Table() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Br() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Span() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Em() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Strong() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Dfn() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Code() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Samp() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Kbd() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(26);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Var() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(27);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Cite() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(28);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Abbr() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(29);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Acronym() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(30);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Q() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(31);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Tt() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(32);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(32);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_I() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(33);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(33);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_B() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(34);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(34);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Big() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(35);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(35);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Small() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(36);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(36);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Sub() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(37);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(37);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Sup() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(38);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(38);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_A() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(39);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(39);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Object() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(40);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(40);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Ins() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(41);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(41);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlObjectType_Del() {
-        return (EReference)getXhtmlObjectType().getEStructuralFeatures().get(42);
+		return (EReference) getXhtmlObjectType().getEStructuralFeatures().get(42);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Archive() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(43);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(43);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Class() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(44);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(44);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Classid() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(45);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(45);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Codebase() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(46);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(46);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Codetype() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(47);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(47);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Data() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(48);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(48);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Declare() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(49);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(49);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Height() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(50);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(50);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Id() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(51);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(51);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Lang() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(52);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(52);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Name() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(53);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(53);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Space() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(54);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(54);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Standby() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(55);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(55);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Style() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(56);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(56);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Tabindex() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(57);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(57);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Title() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(58);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(58);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Type() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(59);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(59);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlObjectType_Width() {
-        return (EAttribute)getXhtmlObjectType().getEStructuralFeatures().get(60);
+		return (EAttribute) getXhtmlObjectType().getEStructuralFeatures().get(60);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlOlType() {
 		if (xhtmlOlTypeEClass == null) {
-			xhtmlOlTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(45);
+			xhtmlOlTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(45);
 		}
 		return xhtmlOlTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlOlType_Li() {
-        return (EReference)getXhtmlOlType().getEStructuralFeatures().get(0);
+		return (EReference) getXhtmlOlType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlOlType_Class() {
-        return (EAttribute)getXhtmlOlType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlOlType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlOlType_Id() {
-        return (EAttribute)getXhtmlOlType().getEStructuralFeatures().get(2);
+		return (EAttribute) getXhtmlOlType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlOlType_Lang() {
-        return (EAttribute)getXhtmlOlType().getEStructuralFeatures().get(3);
+		return (EAttribute) getXhtmlOlType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlOlType_Space() {
-        return (EAttribute)getXhtmlOlType().getEStructuralFeatures().get(4);
+		return (EAttribute) getXhtmlOlType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlOlType_Style() {
-        return (EAttribute)getXhtmlOlType().getEStructuralFeatures().get(5);
+		return (EAttribute) getXhtmlOlType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlOlType_Title() {
-        return (EAttribute)getXhtmlOlType().getEStructuralFeatures().get(6);
+		return (EAttribute) getXhtmlOlType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlParamType() {
 		if (xhtmlParamTypeEClass == null) {
-			xhtmlParamTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(46);
+			xhtmlParamTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(46);
 		}
 		return xhtmlParamTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlParamType_Id() {
-        return (EAttribute)getXhtmlParamType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlParamType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlParamType_Name() {
-        return (EAttribute)getXhtmlParamType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlParamType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlParamType_Type() {
-        return (EAttribute)getXhtmlParamType().getEStructuralFeatures().get(2);
+		return (EAttribute) getXhtmlParamType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlParamType_Value() {
-        return (EAttribute)getXhtmlParamType().getEStructuralFeatures().get(3);
+		return (EAttribute) getXhtmlParamType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlParamType_Valuetype() {
-        return (EAttribute)getXhtmlParamType().getEStructuralFeatures().get(4);
+		return (EAttribute) getXhtmlParamType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlPreType() {
 		if (xhtmlPreTypeEClass == null) {
-			xhtmlPreTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(47);
+			xhtmlPreTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(47);
 		}
 		return xhtmlPreTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlPreType_Mixed() {
-        return (EAttribute)getXhtmlPreType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlPreType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlPreType_XhtmlInlinePreMix() {
-        return (EAttribute)getXhtmlPreType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlPreType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_Br() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_Span() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_Em() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_Strong() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_Dfn() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_Code() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_Samp() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_Kbd() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_Var() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_Cite() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_Abbr() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_Acronym() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_Q() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_Tt() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_I() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_B() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_A() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_Ins() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPreType_Del() {
-        return (EReference)getXhtmlPreType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlPreType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlPreType_Class() {
-        return (EAttribute)getXhtmlPreType().getEStructuralFeatures().get(21);
+		return (EAttribute) getXhtmlPreType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlPreType_Id() {
-        return (EAttribute)getXhtmlPreType().getEStructuralFeatures().get(22);
+		return (EAttribute) getXhtmlPreType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlPreType_Lang() {
-        return (EAttribute)getXhtmlPreType().getEStructuralFeatures().get(23);
+		return (EAttribute) getXhtmlPreType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlPreType_Space() {
-        return (EAttribute)getXhtmlPreType().getEStructuralFeatures().get(24);
+		return (EAttribute) getXhtmlPreType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlPreType_Style() {
-        return (EAttribute)getXhtmlPreType().getEStructuralFeatures().get(25);
+		return (EAttribute) getXhtmlPreType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlPreType_Title() {
-        return (EAttribute)getXhtmlPreType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlPreType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlPType() {
 		if (xhtmlPTypeEClass == null) {
-			xhtmlPTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(48);
+			xhtmlPTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(48);
 		}
 		return xhtmlPTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlPType_Mixed() {
-        return (EAttribute)getXhtmlPType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlPType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlPType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlPType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlPType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Br() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Span() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Em() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Strong() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Dfn() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Code() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Samp() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Kbd() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Var() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Cite() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Abbr() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Acronym() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Q() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Tt() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_I() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_B() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Big() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Small() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Sub() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Sup() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_A() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Object() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Ins() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlPType_Del() {
-        return (EReference)getXhtmlPType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlPType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlPType_Class() {
-        return (EAttribute)getXhtmlPType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlPType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlPType_Id() {
-        return (EAttribute)getXhtmlPType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlPType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlPType_Lang() {
-        return (EAttribute)getXhtmlPType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlPType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlPType_Space() {
-        return (EAttribute)getXhtmlPType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlPType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlPType_Style() {
-        return (EAttribute)getXhtmlPType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlPType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlPType_Title() {
-        return (EAttribute)getXhtmlPType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlPType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlQType() {
 		if (xhtmlQTypeEClass == null) {
-			xhtmlQTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(49);
+			xhtmlQTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(49);
 		}
 		return xhtmlQTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlQType_Mixed() {
-        return (EAttribute)getXhtmlQType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlQType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlQType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlQType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlQType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Br() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Span() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Em() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Strong() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Dfn() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Code() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Samp() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Kbd() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Var() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Cite() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Abbr() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Acronym() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Q() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Tt() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_I() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_B() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Big() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Small() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Sub() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Sup() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_A() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Object() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Ins() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlQType_Del() {
-        return (EReference)getXhtmlQType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlQType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlQType_Cite1() {
-        return (EAttribute)getXhtmlQType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlQType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlQType_Class() {
-        return (EAttribute)getXhtmlQType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlQType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlQType_Id() {
-        return (EAttribute)getXhtmlQType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlQType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlQType_Lang() {
-        return (EAttribute)getXhtmlQType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlQType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlQType_Space() {
-        return (EAttribute)getXhtmlQType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlQType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlQType_Style() {
-        return (EAttribute)getXhtmlQType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlQType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlQType_Title() {
-        return (EAttribute)getXhtmlQType().getEStructuralFeatures().get(32);
+		return (EAttribute) getXhtmlQType().getEStructuralFeatures().get(32);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlSampType() {
 		if (xhtmlSampTypeEClass == null) {
-			xhtmlSampTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(50);
+			xhtmlSampTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(50);
 		}
 		return xhtmlSampTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlSampType_Mixed() {
-        return (EAttribute)getXhtmlSampType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlSampType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlSampType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlSampType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlSampType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Br() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Span() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Em() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Strong() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Dfn() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Code() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Samp() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Kbd() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Var() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Cite() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Abbr() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Acronym() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Q() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Tt() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_I() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_B() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Big() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Small() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Sub() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Sup() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_A() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Object() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Ins() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSampType_Del() {
-        return (EReference)getXhtmlSampType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlSampType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlSampType_Class() {
-        return (EAttribute)getXhtmlSampType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlSampType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlSampType_Id() {
-        return (EAttribute)getXhtmlSampType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlSampType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlSampType_Lang() {
-        return (EAttribute)getXhtmlSampType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlSampType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlSampType_Space() {
-        return (EAttribute)getXhtmlSampType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlSampType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlSampType_Style() {
-        return (EAttribute)getXhtmlSampType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlSampType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlSampType_Title() {
-        return (EAttribute)getXhtmlSampType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlSampType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlSpanType() {
 		if (xhtmlSpanTypeEClass == null) {
-			xhtmlSpanTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(51);
+			xhtmlSpanTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(51);
 		}
 		return xhtmlSpanTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlSpanType_Mixed() {
-        return (EAttribute)getXhtmlSpanType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlSpanType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlSpanType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlSpanType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlSpanType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Br() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Span() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Em() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Strong() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Dfn() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Code() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Samp() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Kbd() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Var() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Cite() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Abbr() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Acronym() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Q() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Tt() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_I() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_B() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Big() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Small() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Sub() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Sup() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_A() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Object() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Ins() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlSpanType_Del() {
-        return (EReference)getXhtmlSpanType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlSpanType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlSpanType_Class() {
-        return (EAttribute)getXhtmlSpanType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlSpanType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlSpanType_Id() {
-        return (EAttribute)getXhtmlSpanType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlSpanType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlSpanType_Lang() {
-        return (EAttribute)getXhtmlSpanType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlSpanType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlSpanType_Space() {
-        return (EAttribute)getXhtmlSpanType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlSpanType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlSpanType_Style() {
-        return (EAttribute)getXhtmlSpanType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlSpanType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlSpanType_Title() {
-        return (EAttribute)getXhtmlSpanType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlSpanType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlStrongType() {
 		if (xhtmlStrongTypeEClass == null) {
-			xhtmlStrongTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(52);
+			xhtmlStrongTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(52);
 		}
 		return xhtmlStrongTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlStrongType_Mixed() {
-        return (EAttribute)getXhtmlStrongType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlStrongType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlStrongType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlStrongType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlStrongType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Br() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Span() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Em() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Strong() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Dfn() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Code() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Samp() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Kbd() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Var() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Cite() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Abbr() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Acronym() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Q() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Tt() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_I() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_B() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Big() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Small() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Sub() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Sup() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_A() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Object() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Ins() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlStrongType_Del() {
-        return (EReference)getXhtmlStrongType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlStrongType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlStrongType_Class() {
-        return (EAttribute)getXhtmlStrongType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlStrongType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlStrongType_Id() {
-        return (EAttribute)getXhtmlStrongType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlStrongType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlStrongType_Lang() {
-        return (EAttribute)getXhtmlStrongType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlStrongType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlStrongType_Space() {
-        return (EAttribute)getXhtmlStrongType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlStrongType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlStrongType_Style() {
-        return (EAttribute)getXhtmlStrongType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlStrongType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlStrongType_Title() {
-        return (EAttribute)getXhtmlStrongType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlStrongType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlTableType() {
 		if (xhtmlTableTypeEClass == null) {
-			xhtmlTableTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(53);
+			xhtmlTableTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(53);
 		}
 		return xhtmlTableTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTableType_Caption() {
-        return (EReference)getXhtmlTableType().getEStructuralFeatures().get(0);
+		return (EReference) getXhtmlTableType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTableType_Col() {
-        return (EReference)getXhtmlTableType().getEStructuralFeatures().get(1);
+		return (EReference) getXhtmlTableType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTableType_Colgroup() {
-        return (EReference)getXhtmlTableType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlTableType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTableType_Thead() {
-        return (EReference)getXhtmlTableType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlTableType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTableType_Tfoot() {
-        return (EReference)getXhtmlTableType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlTableType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTableType_Tbody() {
-        return (EReference)getXhtmlTableType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlTableType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTableType_Tr() {
-        return (EReference)getXhtmlTableType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlTableType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTableType_Border() {
-        return (EAttribute)getXhtmlTableType().getEStructuralFeatures().get(7);
+		return (EAttribute) getXhtmlTableType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTableType_Cellpadding() {
-        return (EAttribute)getXhtmlTableType().getEStructuralFeatures().get(8);
+		return (EAttribute) getXhtmlTableType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTableType_Cellspacing() {
-        return (EAttribute)getXhtmlTableType().getEStructuralFeatures().get(9);
+		return (EAttribute) getXhtmlTableType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTableType_Class() {
-        return (EAttribute)getXhtmlTableType().getEStructuralFeatures().get(10);
+		return (EAttribute) getXhtmlTableType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTableType_Frame() {
-        return (EAttribute)getXhtmlTableType().getEStructuralFeatures().get(11);
+		return (EAttribute) getXhtmlTableType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTableType_Id() {
-        return (EAttribute)getXhtmlTableType().getEStructuralFeatures().get(12);
+		return (EAttribute) getXhtmlTableType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTableType_Lang() {
-        return (EAttribute)getXhtmlTableType().getEStructuralFeatures().get(13);
+		return (EAttribute) getXhtmlTableType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTableType_Rules() {
-        return (EAttribute)getXhtmlTableType().getEStructuralFeatures().get(14);
+		return (EAttribute) getXhtmlTableType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTableType_Space() {
-        return (EAttribute)getXhtmlTableType().getEStructuralFeatures().get(15);
+		return (EAttribute) getXhtmlTableType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTableType_Style() {
-        return (EAttribute)getXhtmlTableType().getEStructuralFeatures().get(16);
+		return (EAttribute) getXhtmlTableType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTableType_Summary() {
-        return (EAttribute)getXhtmlTableType().getEStructuralFeatures().get(17);
+		return (EAttribute) getXhtmlTableType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTableType_Title() {
-        return (EAttribute)getXhtmlTableType().getEStructuralFeatures().get(18);
+		return (EAttribute) getXhtmlTableType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTableType_Width() {
-        return (EAttribute)getXhtmlTableType().getEStructuralFeatures().get(19);
+		return (EAttribute) getXhtmlTableType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlTbodyType() {
 		if (xhtmlTbodyTypeEClass == null) {
-			xhtmlTbodyTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(54);
+			xhtmlTbodyTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(54);
 		}
 		return xhtmlTbodyTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTbodyType_Tr() {
-        return (EReference)getXhtmlTbodyType().getEStructuralFeatures().get(0);
+		return (EReference) getXhtmlTbodyType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTbodyType_Align() {
-        return (EAttribute)getXhtmlTbodyType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlTbodyType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTbodyType_Char() {
-        return (EAttribute)getXhtmlTbodyType().getEStructuralFeatures().get(2);
+		return (EAttribute) getXhtmlTbodyType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTbodyType_Charoff() {
-        return (EAttribute)getXhtmlTbodyType().getEStructuralFeatures().get(3);
+		return (EAttribute) getXhtmlTbodyType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTbodyType_Class() {
-        return (EAttribute)getXhtmlTbodyType().getEStructuralFeatures().get(4);
+		return (EAttribute) getXhtmlTbodyType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTbodyType_Id() {
-        return (EAttribute)getXhtmlTbodyType().getEStructuralFeatures().get(5);
+		return (EAttribute) getXhtmlTbodyType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTbodyType_Lang() {
-        return (EAttribute)getXhtmlTbodyType().getEStructuralFeatures().get(6);
+		return (EAttribute) getXhtmlTbodyType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTbodyType_Space() {
-        return (EAttribute)getXhtmlTbodyType().getEStructuralFeatures().get(7);
+		return (EAttribute) getXhtmlTbodyType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTbodyType_Style() {
-        return (EAttribute)getXhtmlTbodyType().getEStructuralFeatures().get(8);
+		return (EAttribute) getXhtmlTbodyType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTbodyType_Title() {
-        return (EAttribute)getXhtmlTbodyType().getEStructuralFeatures().get(9);
+		return (EAttribute) getXhtmlTbodyType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTbodyType_Valign() {
-        return (EAttribute)getXhtmlTbodyType().getEStructuralFeatures().get(10);
+		return (EAttribute) getXhtmlTbodyType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlTdType() {
 		if (xhtmlTdTypeEClass == null) {
-			xhtmlTdTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(55);
+			xhtmlTdTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(55);
 		}
 		return xhtmlTdTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Mixed() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_XhtmlFlowMix() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_H1() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_H2() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_H3() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_H4() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_H5() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_H6() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Ul() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Ol() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Dl() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_P() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Div() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Pre() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Blockquote() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Address() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Hr() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Table() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Br() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Span() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Em() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Strong() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Dfn() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Code() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Samp() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Kbd() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Var() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(26);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Cite() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(27);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Abbr() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(28);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Acronym() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(29);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Q() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(30);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Tt() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(31);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_I() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(32);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(32);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_B() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(33);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(33);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Big() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(34);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(34);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Small() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(35);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(35);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Sub() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(36);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(36);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Sup() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(37);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(37);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_A() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(38);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(38);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Object() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(39);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(39);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Ins() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(40);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(40);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTdType_Del() {
-        return (EReference)getXhtmlTdType().getEStructuralFeatures().get(41);
+		return (EReference) getXhtmlTdType().getEStructuralFeatures().get(41);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Abbr1() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(42);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(42);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Align() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(43);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(43);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Axis() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(44);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(44);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Char() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(45);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(45);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Charoff() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(46);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(46);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Class() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(47);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(47);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Colspan() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(48);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(48);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Headers() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(49);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(49);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Id() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(50);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(50);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Lang() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(51);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(51);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Rowspan() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(52);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(52);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Scope() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(53);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(53);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Space() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(54);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(54);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Style() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(55);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(55);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Title() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(56);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(56);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTdType_Valign() {
-        return (EAttribute)getXhtmlTdType().getEStructuralFeatures().get(57);
+		return (EAttribute) getXhtmlTdType().getEStructuralFeatures().get(57);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlTfootType() {
 		if (xhtmlTfootTypeEClass == null) {
-			xhtmlTfootTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(56);
+			xhtmlTfootTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(56);
 		}
 		return xhtmlTfootTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTfootType_Tr() {
-        return (EReference)getXhtmlTfootType().getEStructuralFeatures().get(0);
+		return (EReference) getXhtmlTfootType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTfootType_Align() {
-        return (EAttribute)getXhtmlTfootType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlTfootType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTfootType_Char() {
-        return (EAttribute)getXhtmlTfootType().getEStructuralFeatures().get(2);
+		return (EAttribute) getXhtmlTfootType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTfootType_Charoff() {
-        return (EAttribute)getXhtmlTfootType().getEStructuralFeatures().get(3);
+		return (EAttribute) getXhtmlTfootType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTfootType_Class() {
-        return (EAttribute)getXhtmlTfootType().getEStructuralFeatures().get(4);
+		return (EAttribute) getXhtmlTfootType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTfootType_Id() {
-        return (EAttribute)getXhtmlTfootType().getEStructuralFeatures().get(5);
+		return (EAttribute) getXhtmlTfootType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTfootType_Lang() {
-        return (EAttribute)getXhtmlTfootType().getEStructuralFeatures().get(6);
+		return (EAttribute) getXhtmlTfootType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTfootType_Space() {
-        return (EAttribute)getXhtmlTfootType().getEStructuralFeatures().get(7);
+		return (EAttribute) getXhtmlTfootType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTfootType_Style() {
-        return (EAttribute)getXhtmlTfootType().getEStructuralFeatures().get(8);
+		return (EAttribute) getXhtmlTfootType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTfootType_Title() {
-        return (EAttribute)getXhtmlTfootType().getEStructuralFeatures().get(9);
+		return (EAttribute) getXhtmlTfootType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTfootType_Valign() {
-        return (EAttribute)getXhtmlTfootType().getEStructuralFeatures().get(10);
+		return (EAttribute) getXhtmlTfootType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlTheadType() {
 		if (xhtmlTheadTypeEClass == null) {
-			xhtmlTheadTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(57);
+			xhtmlTheadTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(57);
 		}
 		return xhtmlTheadTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTheadType_Tr() {
-        return (EReference)getXhtmlTheadType().getEStructuralFeatures().get(0);
+		return (EReference) getXhtmlTheadType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTheadType_Align() {
-        return (EAttribute)getXhtmlTheadType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlTheadType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTheadType_Char() {
-        return (EAttribute)getXhtmlTheadType().getEStructuralFeatures().get(2);
+		return (EAttribute) getXhtmlTheadType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTheadType_Charoff() {
-        return (EAttribute)getXhtmlTheadType().getEStructuralFeatures().get(3);
+		return (EAttribute) getXhtmlTheadType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTheadType_Class() {
-        return (EAttribute)getXhtmlTheadType().getEStructuralFeatures().get(4);
+		return (EAttribute) getXhtmlTheadType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTheadType_Id() {
-        return (EAttribute)getXhtmlTheadType().getEStructuralFeatures().get(5);
+		return (EAttribute) getXhtmlTheadType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTheadType_Lang() {
-        return (EAttribute)getXhtmlTheadType().getEStructuralFeatures().get(6);
+		return (EAttribute) getXhtmlTheadType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTheadType_Space() {
-        return (EAttribute)getXhtmlTheadType().getEStructuralFeatures().get(7);
+		return (EAttribute) getXhtmlTheadType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTheadType_Style() {
-        return (EAttribute)getXhtmlTheadType().getEStructuralFeatures().get(8);
+		return (EAttribute) getXhtmlTheadType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTheadType_Title() {
-        return (EAttribute)getXhtmlTheadType().getEStructuralFeatures().get(9);
+		return (EAttribute) getXhtmlTheadType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTheadType_Valign() {
-        return (EAttribute)getXhtmlTheadType().getEStructuralFeatures().get(10);
+		return (EAttribute) getXhtmlTheadType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlThType() {
 		if (xhtmlThTypeEClass == null) {
-			xhtmlThTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(58);
+			xhtmlThTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(58);
 		}
 		return xhtmlThTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Mixed() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_XhtmlFlowMix() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_H1() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_H2() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_H3() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_H4() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_H5() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_H6() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Ul() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Ol() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Dl() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_P() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Div() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Pre() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Blockquote() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Address() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Hr() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Table() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Br() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Span() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Em() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Strong() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Dfn() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Code() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Samp() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Kbd() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Var() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(26);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Cite() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(27);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Abbr() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(28);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Acronym() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(29);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Q() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(30);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Tt() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(31);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_I() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(32);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(32);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_B() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(33);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(33);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Big() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(34);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(34);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Small() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(35);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(35);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Sub() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(36);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(36);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Sup() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(37);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(37);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_A() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(38);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(38);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Object() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(39);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(39);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Ins() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(40);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(40);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlThType_Del() {
-        return (EReference)getXhtmlThType().getEStructuralFeatures().get(41);
+		return (EReference) getXhtmlThType().getEStructuralFeatures().get(41);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Abbr1() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(42);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(42);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Align() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(43);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(43);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Axis() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(44);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(44);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Char() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(45);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(45);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Charoff() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(46);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(46);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Class() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(47);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(47);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Colspan() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(48);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(48);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Headers() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(49);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(49);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Id() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(50);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(50);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Lang() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(51);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(51);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Rowspan() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(52);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(52);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Scope() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(53);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(53);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Space() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(54);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(54);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Style() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(55);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(55);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Title() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(56);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(56);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlThType_Valign() {
-        return (EAttribute)getXhtmlThType().getEStructuralFeatures().get(57);
+		return (EAttribute) getXhtmlThType().getEStructuralFeatures().get(57);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlTrType() {
 		if (xhtmlTrTypeEClass == null) {
-			xhtmlTrTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(59);
+			xhtmlTrTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(59);
 		}
 		return xhtmlTrTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTrType_Group() {
-        return (EAttribute)getXhtmlTrType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlTrType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTrType_Th() {
-        return (EReference)getXhtmlTrType().getEStructuralFeatures().get(1);
+		return (EReference) getXhtmlTrType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlTrType_Td() {
-        return (EReference)getXhtmlTrType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlTrType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTrType_Align() {
-        return (EAttribute)getXhtmlTrType().getEStructuralFeatures().get(3);
+		return (EAttribute) getXhtmlTrType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTrType_Char() {
-        return (EAttribute)getXhtmlTrType().getEStructuralFeatures().get(4);
+		return (EAttribute) getXhtmlTrType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTrType_Charoff() {
-        return (EAttribute)getXhtmlTrType().getEStructuralFeatures().get(5);
+		return (EAttribute) getXhtmlTrType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTrType_Class() {
-        return (EAttribute)getXhtmlTrType().getEStructuralFeatures().get(6);
+		return (EAttribute) getXhtmlTrType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTrType_Id() {
-        return (EAttribute)getXhtmlTrType().getEStructuralFeatures().get(7);
+		return (EAttribute) getXhtmlTrType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTrType_Lang() {
-        return (EAttribute)getXhtmlTrType().getEStructuralFeatures().get(8);
+		return (EAttribute) getXhtmlTrType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTrType_Space() {
-        return (EAttribute)getXhtmlTrType().getEStructuralFeatures().get(9);
+		return (EAttribute) getXhtmlTrType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTrType_Style() {
-        return (EAttribute)getXhtmlTrType().getEStructuralFeatures().get(10);
+		return (EAttribute) getXhtmlTrType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTrType_Title() {
-        return (EAttribute)getXhtmlTrType().getEStructuralFeatures().get(11);
+		return (EAttribute) getXhtmlTrType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlTrType_Valign() {
-        return (EAttribute)getXhtmlTrType().getEStructuralFeatures().get(12);
+		return (EAttribute) getXhtmlTrType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlUlType() {
 		if (xhtmlUlTypeEClass == null) {
-			xhtmlUlTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(60);
+			xhtmlUlTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(60);
 		}
 		return xhtmlUlTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlUlType_Li() {
-        return (EReference)getXhtmlUlType().getEStructuralFeatures().get(0);
+		return (EReference) getXhtmlUlType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlUlType_Class() {
-        return (EAttribute)getXhtmlUlType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlUlType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlUlType_Id() {
-        return (EAttribute)getXhtmlUlType().getEStructuralFeatures().get(2);
+		return (EAttribute) getXhtmlUlType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlUlType_Lang() {
-        return (EAttribute)getXhtmlUlType().getEStructuralFeatures().get(3);
+		return (EAttribute) getXhtmlUlType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlUlType_Space() {
-        return (EAttribute)getXhtmlUlType().getEStructuralFeatures().get(4);
+		return (EAttribute) getXhtmlUlType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlUlType_Style() {
-        return (EAttribute)getXhtmlUlType().getEStructuralFeatures().get(5);
+		return (EAttribute) getXhtmlUlType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlUlType_Title() {
-        return (EAttribute)getXhtmlUlType().getEStructuralFeatures().get(6);
+		return (EAttribute) getXhtmlUlType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getXhtmlVarType() {
 		if (xhtmlVarTypeEClass == null) {
-			xhtmlVarTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(61);
+			xhtmlVarTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(61);
 		}
 		return xhtmlVarTypeEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlVarType_Mixed() {
-        return (EAttribute)getXhtmlVarType().getEStructuralFeatures().get(0);
+		return (EAttribute) getXhtmlVarType().getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlVarType_XhtmlInlineMix() {
-        return (EAttribute)getXhtmlVarType().getEStructuralFeatures().get(1);
+		return (EAttribute) getXhtmlVarType().getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Br() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(2);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Span() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(3);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Em() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(4);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Strong() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(5);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Dfn() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(6);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Code() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(7);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Samp() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(8);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Kbd() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(9);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Var() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(10);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Cite() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(11);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Abbr() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(12);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Acronym() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(13);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(13);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Q() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(14);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(14);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Tt() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(15);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(15);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_I() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(16);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(16);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_B() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(17);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(17);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Big() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(18);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(18);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Small() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(19);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(19);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Sub() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(20);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(20);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Sup() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(21);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(21);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_A() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(22);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(22);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Object() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(23);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(23);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Ins() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(24);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(24);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getXhtmlVarType_Del() {
-        return (EReference)getXhtmlVarType().getEStructuralFeatures().get(25);
+		return (EReference) getXhtmlVarType().getEStructuralFeatures().get(25);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlVarType_Class() {
-        return (EAttribute)getXhtmlVarType().getEStructuralFeatures().get(26);
+		return (EAttribute) getXhtmlVarType().getEStructuralFeatures().get(26);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlVarType_Id() {
-        return (EAttribute)getXhtmlVarType().getEStructuralFeatures().get(27);
+		return (EAttribute) getXhtmlVarType().getEStructuralFeatures().get(27);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlVarType_Lang() {
-        return (EAttribute)getXhtmlVarType().getEStructuralFeatures().get(28);
+		return (EAttribute) getXhtmlVarType().getEStructuralFeatures().get(28);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlVarType_Space() {
-        return (EAttribute)getXhtmlVarType().getEStructuralFeatures().get(29);
+		return (EAttribute) getXhtmlVarType().getEStructuralFeatures().get(29);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlVarType_Style() {
-        return (EAttribute)getXhtmlVarType().getEStructuralFeatures().get(30);
+		return (EAttribute) getXhtmlVarType().getEStructuralFeatures().get(30);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getXhtmlVarType_Title() {
-        return (EAttribute)getXhtmlVarType().getEStructuralFeatures().get(31);
+		return (EAttribute) getXhtmlVarType().getEStructuralFeatures().get(31);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getAlignType() {
 		if (alignTypeEEnum == null) {
-			alignTypeEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(0);
+			alignTypeEEnum = (EEnum) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(0);
 		}
 		return alignTypeEEnum;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getDeclareType() {
 		if (declareTypeEEnum == null) {
-			declareTypeEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(2);
+			declareTypeEEnum = (EEnum) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(2);
 		}
 		return declareTypeEEnum;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getFrameType() {
 		if (frameTypeEEnum == null) {
-			frameTypeEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(5);
+			frameTypeEEnum = (EEnum) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(5);
 		}
 		return frameTypeEEnum;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getRulesType() {
 		if (rulesTypeEEnum == null) {
-			rulesTypeEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(7);
+			rulesTypeEEnum = (EEnum) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(7);
 		}
 		return rulesTypeEEnum;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getScopeType() {
 		if (scopeTypeEEnum == null) {
-			scopeTypeEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(9);
+			scopeTypeEEnum = (EEnum) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(9);
 		}
 		return scopeTypeEEnum;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getValignType() {
 		if (valignTypeEEnum == null) {
-			valignTypeEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(11);
+			valignTypeEEnum = (EEnum) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(11);
 		}
 		return valignTypeEEnum;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getValuetypeType() {
 		if (valuetypeTypeEEnum == null) {
-			valuetypeTypeEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(13);
+			valuetypeTypeEEnum = (EEnum) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(13);
 		}
 		return valuetypeTypeEEnum;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getAlignTypeObject() {
 		if (alignTypeObjectEDataType == null) {
-			alignTypeObjectEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(1);
+			alignTypeObjectEDataType = (EDataType) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(1);
 		}
 		return alignTypeObjectEDataType;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getDeclareTypeObject() {
 		if (declareTypeObjectEDataType == null) {
-			declareTypeObjectEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(3);
+			declareTypeObjectEDataType = (EDataType) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(3);
 		}
 		return declareTypeObjectEDataType;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getFrameTypeObject() {
 		if (frameTypeObjectEDataType == null) {
-			frameTypeObjectEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(6);
+			frameTypeObjectEDataType = (EDataType) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(6);
 		}
 		return frameTypeObjectEDataType;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getRulesTypeObject() {
 		if (rulesTypeObjectEDataType == null) {
-			rulesTypeObjectEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(8);
+			rulesTypeObjectEDataType = (EDataType) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(8);
 		}
 		return rulesTypeObjectEDataType;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getScopeTypeObject() {
 		if (scopeTypeObjectEDataType == null) {
-			scopeTypeObjectEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(10);
+			scopeTypeObjectEDataType = (EDataType) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(10);
 		}
 		return scopeTypeObjectEDataType;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getValignTypeObject() {
 		if (valignTypeObjectEDataType == null) {
-			valignTypeObjectEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(12);
+			valignTypeObjectEDataType = (EDataType) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(12);
 		}
 		return valignTypeObjectEDataType;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getValuetypeTypeObject() {
 		if (valuetypeTypeObjectEDataType == null) {
-			valuetypeTypeObjectEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(14);
+			valuetypeTypeObjectEDataType = (EDataType) EPackage.Registry.INSTANCE.getEPackage(XhtmlPackage.eNS_URI).getEClassifiers().get(14);
 		}
 		return valuetypeTypeObjectEDataType;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlFactory getXhtmlFactory() {
-		return (XhtmlFactory)getEFactoryInstance();
+		return (XhtmlFactory) getEFactoryInstance();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isLoaded = false;
 
 	/**
-	 * Laods the package and any sub-packages from their serialized form.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Laods the package and any sub-packages from their serialized form. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void loadPackage() {
-		if (isLoaded) return;
+		if (isLoaded) {
+			return;
+		}
 		isLoaded = true;
 
 		URL url = getClass().getResource(packageFilename);
 		if (url == null) {
-			throw new RuntimeException("Missing serialized package: " + packageFilename);
+			throw new RuntimeException("Missing serialized package: " + packageFilename); //$NON-NLS-1$
 		}
 		URI uri = URI.createURI(url.toString());
 		Resource resource = new EcoreResourceFactoryImpl().createResource(uri);
 		try {
 			resource.load(null);
-		}
-		catch (IOException exception) {
+		} catch (IOException exception) {
 			throw new WrappedException(exception);
 		}
-		initializeFromLoadedEPackage(this, (EPackage)resource.getContents().get(0));
+		initializeFromLoadedEPackage(this, (EPackage) resource.getContents().get(0));
 		createResource(eNS_URI);
 	}
 
-
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isFixed = false;
 
 	/**
-	 * Fixes up the loaded package, to make it appear as if it had been programmatically built.
-	 * <!-- begin-user-doc -->
+	 * Fixes up the loaded package, to make it appear as if it had been programmatically built. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void fixPackageContents() {
-		if (isFixed) return;
+		if (isFixed) {
+			return;
+		}
 		isFixed = true;
 		fixEClassifiers();
 	}
 
 	/**
-	 * Sets the instance class on the given classifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the instance class on the given classifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void fixInstanceClass(EClassifier eClassifier) {
 		if (eClassifier.getInstanceClassName() == null) {
-			eClassifier.setInstanceClassName("org.eclipse.rmf.reqif10.xhtml." + eClassifier.getName());
+			eClassifier.setInstanceClassName("org.eclipse.rmf.reqif10.xhtml." + eClassifier.getName()); //$NON-NLS-1$
 			setGeneratedClassName(eClassifier);
 		}
 	}
 
-} //XhtmlPackageImpl
+} // XhtmlPackageImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlParamTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlParamTypeImpl.java
index 6df93a8..7f2a4de 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlParamTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlParamTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,38 +12,32 @@
 package org.eclipse.rmf.reqif10.xhtml.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.rmf.reqif10.xhtml.ValuetypeType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlParamType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Param Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Param Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlParamTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlParamTypeImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlParamTypeImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlParamTypeImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlParamTypeImpl#getValuetype <em>Valuetype</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlParamTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlParamTypeImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlParamTypeImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlParamTypeImpl#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlParamTypeImpl#getValuetype <em>Valuetype</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlParamTypeImpl extends EObjectImpl implements XhtmlParamType {
+public class XhtmlParamTypeImpl extends MinimalEObjectImpl implements XhtmlParamType {
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -51,9 +45,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -61,9 +54,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -71,9 +64,9 @@
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -81,9 +74,9 @@
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -91,9 +84,9 @@
 	protected static final String TYPE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -101,9 +94,9 @@
 	protected String type = TYPE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -111,9 +104,9 @@
 	protected static final String VALUE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -121,9 +114,9 @@
 	protected String value = VALUE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getValuetype() <em>Valuetype</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValuetype() <em>Valuetype</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValuetype()
 	 * @generated
 	 * @ordered
@@ -131,9 +124,9 @@
 	protected static final ValuetypeType VALUETYPE_EDEFAULT = ValuetypeType.DATA;
 
 	/**
-	 * The cached value of the '{@link #getValuetype() <em>Valuetype</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getValuetype() <em>Valuetype</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValuetype()
 	 * @generated
 	 * @ordered
@@ -141,17 +134,16 @@
 	protected ValuetypeType valuetype = VALUETYPE_EDEFAULT;
 
 	/**
-	 * This is true if the Valuetype attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Valuetype attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean valuetypeESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlParamTypeImpl() {
@@ -159,8 +151,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -169,8 +161,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -178,8 +170,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -190,8 +182,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -199,8 +191,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
@@ -211,8 +203,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getType() {
@@ -220,8 +212,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(String newType) {
@@ -232,8 +224,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getValue() {
@@ -241,8 +233,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValue(String newValue) {
@@ -253,8 +245,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ValuetypeType getValuetype() {
@@ -262,8 +254,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValuetype(ValuetypeType newValuetype) {
@@ -272,12 +264,13 @@
 		boolean oldValuetypeESet = valuetypeESet;
 		valuetypeESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_PARAM_TYPE__VALUETYPE, oldValuetype, valuetype, !oldValuetypeESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_PARAM_TYPE__VALUETYPE, oldValuetype, valuetype,
+					!oldValuetypeESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetValuetype() {
@@ -286,12 +279,13 @@
 		valuetype = VALUETYPE_EDEFAULT;
 		valuetypeESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_PARAM_TYPE__VALUETYPE, oldValuetype, VALUETYPE_EDEFAULT, oldValuetypeESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_PARAM_TYPE__VALUETYPE, oldValuetype, VALUETYPE_EDEFAULT,
+					oldValuetypeESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetValuetype() {
@@ -299,125 +293,129 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_PARAM_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_PARAM_TYPE__NAME:
-				return getName();
-			case XhtmlPackage.XHTML_PARAM_TYPE__TYPE:
-				return getType();
-			case XhtmlPackage.XHTML_PARAM_TYPE__VALUE:
-				return getValue();
-			case XhtmlPackage.XHTML_PARAM_TYPE__VALUETYPE:
-				return getValuetype();
+		case XhtmlPackage.XHTML_PARAM_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_PARAM_TYPE__NAME:
+			return getName();
+		case XhtmlPackage.XHTML_PARAM_TYPE__TYPE:
+			return getType();
+		case XhtmlPackage.XHTML_PARAM_TYPE__VALUE:
+			return getValue();
+		case XhtmlPackage.XHTML_PARAM_TYPE__VALUETYPE:
+			return getValuetype();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_PARAM_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_PARAM_TYPE__NAME:
-				setName((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_PARAM_TYPE__TYPE:
-				setType((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_PARAM_TYPE__VALUE:
-				setValue((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_PARAM_TYPE__VALUETYPE:
-				setValuetype((ValuetypeType)newValue);
-				return;
+		case XhtmlPackage.XHTML_PARAM_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_PARAM_TYPE__NAME:
+			setName((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_PARAM_TYPE__TYPE:
+			setType((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_PARAM_TYPE__VALUE:
+			setValue((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_PARAM_TYPE__VALUETYPE:
+			setValuetype((ValuetypeType) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_PARAM_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_PARAM_TYPE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_PARAM_TYPE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_PARAM_TYPE__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_PARAM_TYPE__VALUETYPE:
-				unsetValuetype();
-				return;
+		case XhtmlPackage.XHTML_PARAM_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_PARAM_TYPE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_PARAM_TYPE__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_PARAM_TYPE__VALUE:
+			setValue(VALUE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_PARAM_TYPE__VALUETYPE:
+			unsetValuetype();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_PARAM_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_PARAM_TYPE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case XhtmlPackage.XHTML_PARAM_TYPE__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case XhtmlPackage.XHTML_PARAM_TYPE__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case XhtmlPackage.XHTML_PARAM_TYPE__VALUETYPE:
-				return isSetValuetype();
+		case XhtmlPackage.XHTML_PARAM_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_PARAM_TYPE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case XhtmlPackage.XHTML_PARAM_TYPE__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case XhtmlPackage.XHTML_PARAM_TYPE__VALUE:
+			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		case XhtmlPackage.XHTML_PARAM_TYPE__VALUETYPE:
+			return isSetValuetype();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
+		result.append(" (id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", name: ");
+		result.append(", name: "); //$NON-NLS-1$
 		result.append(name);
-		result.append(", type: ");
+		result.append(", type: "); //$NON-NLS-1$
 		result.append(type);
-		result.append(", value: ");
+		result.append(", value: "); //$NON-NLS-1$
 		result.append(value);
-		result.append(", valuetype: ");
-		if (valuetypeESet) result.append(valuetype); else result.append("<unset>");
+		result.append(", valuetype: "); //$NON-NLS-1$
+		if (valuetypeESet)
+			result.append(valuetype);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlParamTypeImpl
+} // XhtmlParamTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlPreTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlPreTypeImpl.java
index b99837e..6c5f193 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlPreTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlPreTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -50,49 +44,47 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Pre Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Pre Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getXhtmlInlinePreMix <em>Xhtml Inline Pre Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getXhtmlInlinePreMix <em>Xhtml Inline Pre Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlPreTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlPreTypeImpl extends EObjectImpl implements XhtmlPreType {
+public class XhtmlPreTypeImpl extends MinimalEObjectImpl implements XhtmlPreType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -100,9 +92,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -110,9 +102,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -120,9 +112,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -130,9 +121,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -140,9 +130,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -150,9 +140,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -160,9 +150,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -170,9 +160,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -180,18 +170,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -199,9 +188,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -209,9 +198,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -219,9 +208,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -229,8 +218,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlPreTypeImpl() {
@@ -238,8 +227,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -248,8 +237,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -260,17 +249,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlinePreMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlPreType_XhtmlInlinePreMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlPreType_XhtmlInlinePreMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -278,8 +267,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -287,8 +276,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -296,8 +285,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -305,8 +294,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -314,8 +303,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -323,8 +312,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -332,8 +321,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -341,8 +330,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -350,8 +339,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -359,8 +348,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -368,8 +357,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -377,8 +366,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -386,8 +375,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -395,8 +384,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -404,8 +393,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -413,8 +402,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -422,8 +411,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -431,8 +420,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -440,8 +429,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -449,8 +438,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -461,8 +450,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -470,8 +459,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -482,8 +471,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -491,8 +480,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -503,8 +492,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -512,8 +501,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -526,8 +515,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -540,8 +529,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -549,8 +538,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -558,8 +547,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -570,8 +559,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -579,8 +568,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -591,425 +580,431 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_PRE_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__XHTML_INLINE_PRE_MIX:
-				return ((InternalEList<?>)getXhtmlInlinePreMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_PRE_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__XHTML_INLINE_PRE_MIX:
+			return ((InternalEList<?>) getXhtmlInlinePreMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_PRE_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_PRE_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_PRE_TYPE__XHTML_INLINE_PRE_MIX:
-				if (coreType) return getXhtmlInlinePreMix();
-				return ((FeatureMap.Internal)getXhtmlInlinePreMix()).getWrapper();
-			case XhtmlPackage.XHTML_PRE_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_PRE_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_PRE_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_PRE_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_PRE_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_PRE_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_PRE_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_PRE_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_PRE_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_PRE_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_PRE_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_PRE_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_PRE_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_PRE_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_PRE_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_PRE_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_PRE_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_PRE_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_PRE_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_PRE_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_PRE_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_PRE_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_PRE_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_PRE_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_PRE_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_PRE_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_PRE_TYPE__XHTML_INLINE_PRE_MIX:
+			if (coreType)
+				return getXhtmlInlinePreMix();
+			return ((FeatureMap.Internal) getXhtmlInlinePreMix()).getWrapper();
+		case XhtmlPackage.XHTML_PRE_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_PRE_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_PRE_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_PRE_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_PRE_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_PRE_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_PRE_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_PRE_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_PRE_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_PRE_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_PRE_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_PRE_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_PRE_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_PRE_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_PRE_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_PRE_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_PRE_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_PRE_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_PRE_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_PRE_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_PRE_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_PRE_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_PRE_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_PRE_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_PRE_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_PRE_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__XHTML_INLINE_PRE_MIX:
-				((FeatureMap.Internal)getXhtmlInlinePreMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_PRE_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__XHTML_INLINE_PRE_MIX:
+			((FeatureMap.Internal) getXhtmlInlinePreMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_PRE_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__XHTML_INLINE_PRE_MIX:
-				getXhtmlInlinePreMix().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_PRE_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_PRE_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__XHTML_INLINE_PRE_MIX:
+			getXhtmlInlinePreMix().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_PRE_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_PRE_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__XHTML_INLINE_PRE_MIX:
-				return !getXhtmlInlinePreMix().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_PRE_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_PRE_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_PRE_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_PRE_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_PRE_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_PRE_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_PRE_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__XHTML_INLINE_PRE_MIX:
+			return !getXhtmlInlinePreMix().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_PRE_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_PRE_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_PRE_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_PRE_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_PRE_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_PRE_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlPreTypeImpl
+} // XhtmlPreTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlQTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlQTypeImpl.java
index b132a78..d2b0e8e 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlQTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlQTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -50,55 +44,53 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>QType</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>QType</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getCite1 <em>Cite1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getCite1 <em>Cite1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlQTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlQTypeImpl extends EObjectImpl implements XhtmlQType {
+public class XhtmlQTypeImpl extends MinimalEObjectImpl implements XhtmlQType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -106,9 +98,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getCite1() <em>Cite1</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCite1() <em>Cite1</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCite1()
 	 * @generated
 	 * @ordered
@@ -116,9 +108,9 @@
 	protected static final String CITE1_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCite1() <em>Cite1</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCite1() <em>Cite1</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getCite1()
 	 * @generated
 	 * @ordered
@@ -126,9 +118,9 @@
 	protected String cite1 = CITE1_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -136,9 +128,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -146,9 +138,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -156,9 +147,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -166,9 +156,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -176,9 +166,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -186,9 +176,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -196,9 +186,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -206,18 +196,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -225,9 +214,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -235,9 +224,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -245,9 +234,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -255,8 +244,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlQTypeImpl() {
@@ -264,8 +253,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -274,8 +263,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -286,17 +275,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlQType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlQType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -304,8 +293,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -313,8 +302,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -322,8 +311,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -331,8 +320,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -340,8 +329,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -349,8 +338,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -358,8 +347,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -367,8 +356,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -376,8 +365,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -385,8 +374,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -394,8 +383,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -403,8 +392,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -412,8 +401,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -421,8 +410,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -430,8 +419,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -439,8 +428,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -448,8 +437,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -457,8 +446,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -466,8 +455,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -475,8 +464,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -484,8 +473,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -493,8 +482,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -502,8 +491,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -511,8 +500,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getCite1() {
@@ -520,8 +509,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCite1(String newCite1) {
@@ -532,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -541,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -553,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -562,8 +551,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -574,8 +563,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -583,8 +572,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -595,8 +584,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -604,8 +593,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -618,8 +607,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -632,8 +621,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -641,8 +630,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -650,8 +639,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -662,8 +651,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -671,8 +660,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -683,502 +672,508 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_QTYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_QTYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_QTYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_QTYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_QTYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_QTYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_QTYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_QTYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_QTYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_QTYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_QTYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_QTYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_QTYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_QTYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_QTYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_QTYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_QTYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_QTYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_QTYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_QTYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_QTYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_QTYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_QTYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_QTYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_QTYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_QTYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_QTYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_QTYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_QTYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_QTYPE__CITE1:
-				return getCite1();
-			case XhtmlPackage.XHTML_QTYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_QTYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_QTYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_QTYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_QTYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_QTYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_QTYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_QTYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_QTYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_QTYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_QTYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_QTYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_QTYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_QTYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_QTYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_QTYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_QTYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_QTYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_QTYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_QTYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_QTYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_QTYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_QTYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_QTYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_QTYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_QTYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_QTYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_QTYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_QTYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_QTYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_QTYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_QTYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_QTYPE__CITE1:
+			return getCite1();
+		case XhtmlPackage.XHTML_QTYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_QTYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_QTYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_QTYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_QTYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_QTYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_QTYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__CITE1:
-				setCite1((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_QTYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__CITE1:
+			setCite1((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_QTYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__CITE1:
-				setCite1(CITE1_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_QTYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_QTYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_QTYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__CITE1:
+			setCite1(CITE1_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_QTYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_QTYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_QTYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_QTYPE__CITE1:
-				return CITE1_EDEFAULT == null ? cite1 != null : !CITE1_EDEFAULT.equals(cite1);
-			case XhtmlPackage.XHTML_QTYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_QTYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_QTYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_QTYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_QTYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_QTYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_QTYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_QTYPE__CITE1:
+			return CITE1_EDEFAULT == null ? cite1 != null : !CITE1_EDEFAULT.equals(cite1);
+		case XhtmlPackage.XHTML_QTYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_QTYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_QTYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_QTYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_QTYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_QTYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", cite1: ");
+		result.append(", cite1: "); //$NON-NLS-1$
 		result.append(cite1);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlQTypeImpl
+} // XhtmlQTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlSampTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlSampTypeImpl.java
index 97c9002..69ccca2 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlSampTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlSampTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -50,54 +44,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Samp Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Samp Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSampTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlSampTypeImpl extends EObjectImpl implements XhtmlSampType {
+public class XhtmlSampTypeImpl extends MinimalEObjectImpl implements XhtmlSampType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -105,9 +97,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -115,9 +107,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -125,9 +117,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -135,9 +126,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -145,9 +135,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -155,9 +145,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -165,9 +155,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -175,9 +165,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -185,18 +175,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -204,9 +193,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -214,9 +203,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -224,9 +213,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -234,8 +223,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlSampTypeImpl() {
@@ -243,8 +232,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -253,8 +242,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -265,17 +254,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlSampType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlSampType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -283,8 +272,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -292,8 +281,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -301,8 +290,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -310,8 +299,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -319,8 +308,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -328,8 +317,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -337,8 +326,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -346,8 +335,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -355,8 +344,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -364,8 +353,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -373,8 +362,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -382,8 +371,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -391,8 +380,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -400,8 +389,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -409,8 +398,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -418,8 +407,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -427,8 +416,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -436,8 +425,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -445,8 +434,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -454,8 +443,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -463,8 +452,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -472,8 +461,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -481,8 +470,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -490,8 +479,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -499,8 +488,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -511,8 +500,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -520,8 +509,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -532,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -541,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -553,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -562,8 +551,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -576,8 +565,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -590,8 +579,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -599,8 +588,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -608,8 +597,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -620,8 +609,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -629,8 +618,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -641,490 +630,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_SAMP_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SAMP_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SAMP_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_SAMP_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_SAMP_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_SAMP_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_SAMP_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_SAMP_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_SAMP_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_SAMP_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_SAMP_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_SAMP_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_SAMP_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_SAMP_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_SAMP_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_SAMP_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_SAMP_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_SAMP_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_SAMP_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_SAMP_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_SAMP_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_SAMP_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_SAMP_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_SAMP_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_SAMP_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_SAMP_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_SAMP_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_SAMP_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_SAMP_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_SAMP_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_SAMP_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_SAMP_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_SAMP_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_SAMP_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_SAMP_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_SAMP_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_SAMP_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_SAMP_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_SAMP_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_SAMP_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_SAMP_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_SAMP_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_SAMP_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_SAMP_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_SAMP_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_SAMP_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_SAMP_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_SAMP_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_SAMP_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_SAMP_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_SAMP_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_SAMP_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_SAMP_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_SAMP_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_SAMP_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_SAMP_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_SAMP_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_SAMP_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_SAMP_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_SAMP_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_SAMP_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_SAMP_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_SAMP_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_SAMP_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_SAMP_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_SAMP_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_SAMP_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_SAMP_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_SAMP_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_SAMP_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_SAMP_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_SAMP_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_SAMP_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_SAMP_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_SAMP_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_SAMP_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_SAMP_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_SAMP_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_SAMP_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_SAMP_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_SAMP_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_SAMP_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_SAMP_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_SAMP_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_SAMP_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlSampTypeImpl
+} // XhtmlSampTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlSpanTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlSpanTypeImpl.java
index ebc8df1..4db68ec 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlSpanTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlSpanTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -50,54 +44,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Span Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Span Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlSpanTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlSpanTypeImpl extends EObjectImpl implements XhtmlSpanType {
+public class XhtmlSpanTypeImpl extends MinimalEObjectImpl implements XhtmlSpanType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -105,9 +97,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -115,9 +107,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -125,9 +117,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -135,9 +126,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -145,9 +135,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -155,9 +145,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -165,9 +155,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -175,9 +165,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -185,18 +175,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -204,9 +193,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -214,9 +203,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -224,9 +213,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -234,8 +223,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlSpanTypeImpl() {
@@ -243,8 +232,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -253,8 +242,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -265,17 +254,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlSpanType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlSpanType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -283,8 +272,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -292,8 +281,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -301,8 +290,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -310,8 +299,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -319,8 +308,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -328,8 +317,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -337,8 +326,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -346,8 +335,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -355,8 +344,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -364,8 +353,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -373,8 +362,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -382,8 +371,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -391,8 +380,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -400,8 +389,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -409,8 +398,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -418,8 +407,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -427,8 +416,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -436,8 +425,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -445,8 +434,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -454,8 +443,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -463,8 +452,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -472,8 +461,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -481,8 +470,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -490,8 +479,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -499,8 +488,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -511,8 +500,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -520,8 +509,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -532,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -541,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -553,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -562,8 +551,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -576,8 +565,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -590,8 +579,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -599,8 +588,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -608,8 +597,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -620,8 +609,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -629,8 +618,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -641,490 +630,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_SPAN_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_SPAN_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_SPAN_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_SPAN_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_SPAN_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_SPAN_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_SPAN_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_SPAN_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_SPAN_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_SPAN_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_SPAN_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_SPAN_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_SPAN_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_SPAN_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_SPAN_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_SPAN_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_SPAN_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_SPAN_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_SPAN_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_SPAN_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_SPAN_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_SPAN_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_SPAN_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_SPAN_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_SPAN_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_SPAN_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_SPAN_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_SPAN_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_SPAN_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_SPAN_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_SPAN_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_SPAN_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_SPAN_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_SPAN_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_SPAN_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_SPAN_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_SPAN_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_SPAN_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_SPAN_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_SPAN_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_SPAN_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_SPAN_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_SPAN_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_SPAN_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_SPAN_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_SPAN_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_SPAN_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_SPAN_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_SPAN_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_SPAN_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_SPAN_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_SPAN_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_SPAN_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_SPAN_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_SPAN_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_SPAN_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_SPAN_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_SPAN_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_SPAN_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_SPAN_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_SPAN_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_SPAN_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_SPAN_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_SPAN_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_SPAN_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_SPAN_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_SPAN_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_SPAN_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_SPAN_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_SPAN_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_SPAN_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_SPAN_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_SPAN_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_SPAN_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_SPAN_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_SPAN_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_SPAN_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_SPAN_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_SPAN_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_SPAN_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_SPAN_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_SPAN_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_SPAN_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_SPAN_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_SPAN_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlSpanTypeImpl
+} // XhtmlSpanTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlStrongTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlStrongTypeImpl.java
index 22e75fd..e37b2f4 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlStrongTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlStrongTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -50,54 +44,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Strong Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Strong Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlStrongTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlStrongTypeImpl extends EObjectImpl implements XhtmlStrongType {
+public class XhtmlStrongTypeImpl extends MinimalEObjectImpl implements XhtmlStrongType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -105,9 +97,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -115,9 +107,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -125,9 +117,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -135,9 +126,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -145,9 +135,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -155,9 +145,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -165,9 +155,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -175,9 +165,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -185,18 +175,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -204,9 +193,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -214,9 +203,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -224,9 +213,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -234,8 +223,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlStrongTypeImpl() {
@@ -243,8 +232,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -253,8 +242,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -265,17 +254,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlStrongType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlStrongType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -283,8 +272,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -292,8 +281,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -301,8 +290,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -310,8 +299,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -319,8 +308,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -328,8 +317,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -337,8 +326,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -346,8 +335,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -355,8 +344,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -364,8 +353,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -373,8 +362,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -382,8 +371,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -391,8 +380,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -400,8 +389,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -409,8 +398,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -418,8 +407,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -427,8 +416,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -436,8 +425,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -445,8 +434,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -454,8 +443,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -463,8 +452,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -472,8 +461,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -481,8 +470,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -490,8 +479,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -499,8 +488,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -511,8 +500,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -520,8 +509,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -532,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -541,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -553,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -562,8 +551,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -576,8 +565,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -590,8 +579,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -599,8 +588,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -608,8 +597,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -620,8 +609,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -629,8 +618,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -641,490 +630,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_STRONG_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_STRONG_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_STRONG_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_STRONG_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_STRONG_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_STRONG_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_STRONG_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_STRONG_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_STRONG_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_STRONG_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_STRONG_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_STRONG_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_STRONG_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_STRONG_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_STRONG_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_STRONG_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_STRONG_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_STRONG_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_STRONG_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_STRONG_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_STRONG_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_STRONG_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_STRONG_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_STRONG_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_STRONG_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_STRONG_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_STRONG_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_STRONG_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_STRONG_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_STRONG_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_STRONG_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_STRONG_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_STRONG_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_STRONG_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_STRONG_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_STRONG_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_STRONG_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_STRONG_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_STRONG_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_STRONG_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_STRONG_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_STRONG_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_STRONG_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_STRONG_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_STRONG_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_STRONG_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_STRONG_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_STRONG_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_STRONG_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_STRONG_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_STRONG_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_STRONG_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_STRONG_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_STRONG_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_STRONG_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_STRONG_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_STRONG_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_STRONG_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_STRONG_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_STRONG_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_STRONG_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_STRONG_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_STRONG_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_STRONG_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_STRONG_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_STRONG_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_STRONG_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_STRONG_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_STRONG_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_STRONG_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_STRONG_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_STRONG_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_STRONG_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_STRONG_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_STRONG_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_STRONG_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_STRONG_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_STRONG_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_STRONG_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_STRONG_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_STRONG_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_STRONG_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_STRONG_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_STRONG_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_STRONG_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlStrongTypeImpl
+} // XhtmlStrongTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTableTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTableTypeImpl.java
index b7379dd..554172d 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTableTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTableTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,25 +12,18 @@
 package org.eclipse.rmf.reqif10.xhtml.impl;
 
 import java.math.BigInteger;
-
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.FrameType;
 import org.eclipse.rmf.reqif10.xhtml.RulesType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType;
@@ -44,42 +37,40 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlTrType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Table Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Table Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getCaption <em>Caption</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getCol <em>Col</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getColgroup <em>Colgroup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getThead <em>Thead</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getTfoot <em>Tfoot</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getTbody <em>Tbody</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getTr <em>Tr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getBorder <em>Border</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getCellpadding <em>Cellpadding</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getCellspacing <em>Cellspacing</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getFrame <em>Frame</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getRules <em>Rules</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getSummary <em>Summary</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getCaption <em>Caption</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getCol <em>Col</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getColgroup <em>Colgroup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getThead <em>Thead</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getTfoot <em>Tfoot</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getTbody <em>Tbody</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getTr <em>Tr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getBorder <em>Border</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getCellpadding <em>Cellpadding</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getCellspacing <em>Cellspacing</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getFrame <em>Frame</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getRules <em>Rules</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getSummary <em>Summary</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTableTypeImpl#getWidth <em>Width</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlTableTypeImpl extends EObjectImpl implements XhtmlTableType {
+public class XhtmlTableTypeImpl extends MinimalEObjectImpl implements XhtmlTableType {
 	/**
-	 * The cached value of the '{@link #getCaption() <em>Caption</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getCaption() <em>Caption</em>}' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getCaption()
 	 * @generated
 	 * @ordered
@@ -87,9 +78,9 @@
 	protected XhtmlCaptionType caption;
 
 	/**
-	 * The cached value of the '{@link #getCol() <em>Col</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCol() <em>Col</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCol()
 	 * @generated
 	 * @ordered
@@ -97,9 +88,9 @@
 	protected EList<XhtmlColType> col;
 
 	/**
-	 * The cached value of the '{@link #getColgroup() <em>Colgroup</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getColgroup() <em>Colgroup</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getColgroup()
 	 * @generated
 	 * @ordered
@@ -107,9 +98,9 @@
 	protected EList<XhtmlColgroupType> colgroup;
 
 	/**
-	 * The cached value of the '{@link #getThead() <em>Thead</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getThead() <em>Thead</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getThead()
 	 * @generated
 	 * @ordered
@@ -117,9 +108,9 @@
 	protected XhtmlTheadType thead;
 
 	/**
-	 * The cached value of the '{@link #getTfoot() <em>Tfoot</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTfoot() <em>Tfoot</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTfoot()
 	 * @generated
 	 * @ordered
@@ -127,9 +118,9 @@
 	protected XhtmlTfootType tfoot;
 
 	/**
-	 * The cached value of the '{@link #getTbody() <em>Tbody</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getTbody() <em>Tbody</em>}' containment reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTbody()
 	 * @generated
 	 * @ordered
@@ -137,9 +128,9 @@
 	protected EList<XhtmlTbodyType> tbody;
 
 	/**
-	 * The cached value of the '{@link #getTr() <em>Tr</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTr() <em>Tr</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTr()
 	 * @generated
 	 * @ordered
@@ -147,9 +138,9 @@
 	protected EList<XhtmlTrType> tr;
 
 	/**
-	 * The default value of the '{@link #getBorder() <em>Border</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getBorder() <em>Border</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getBorder()
 	 * @generated
 	 * @ordered
@@ -157,9 +148,9 @@
 	protected static final BigInteger BORDER_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getBorder() <em>Border</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBorder() <em>Border</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getBorder()
 	 * @generated
 	 * @ordered
@@ -167,9 +158,9 @@
 	protected BigInteger border = BORDER_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCellpadding() <em>Cellpadding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCellpadding() <em>Cellpadding</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCellpadding()
 	 * @generated
 	 * @ordered
@@ -177,9 +168,9 @@
 	protected static final Object CELLPADDING_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCellpadding() <em>Cellpadding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCellpadding() <em>Cellpadding</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCellpadding()
 	 * @generated
 	 * @ordered
@@ -187,9 +178,9 @@
 	protected Object cellpadding = CELLPADDING_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCellspacing() <em>Cellspacing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCellspacing() <em>Cellspacing</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCellspacing()
 	 * @generated
 	 * @ordered
@@ -197,9 +188,9 @@
 	protected static final Object CELLSPACING_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCellspacing() <em>Cellspacing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCellspacing() <em>Cellspacing</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCellspacing()
 	 * @generated
 	 * @ordered
@@ -207,9 +198,9 @@
 	protected Object cellspacing = CELLSPACING_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -217,9 +208,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -227,9 +218,9 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getFrame() <em>Frame</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getFrame() <em>Frame</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getFrame()
 	 * @generated
 	 * @ordered
@@ -237,9 +228,9 @@
 	protected static final FrameType FRAME_EDEFAULT = FrameType.VOID;
 
 	/**
-	 * The cached value of the '{@link #getFrame() <em>Frame</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getFrame() <em>Frame</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getFrame()
 	 * @generated
 	 * @ordered
@@ -247,18 +238,16 @@
 	protected FrameType frame = FRAME_EDEFAULT;
 
 	/**
-	 * This is true if the Frame attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Frame attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean frameESet;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -266,9 +255,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -276,9 +264,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -286,9 +274,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -296,9 +284,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getRules() <em>Rules</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getRules() <em>Rules</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getRules()
 	 * @generated
 	 * @ordered
@@ -306,9 +294,9 @@
 	protected static final RulesType RULES_EDEFAULT = RulesType.NONE;
 
 	/**
-	 * The cached value of the '{@link #getRules() <em>Rules</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getRules() <em>Rules</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getRules()
 	 * @generated
 	 * @ordered
@@ -316,18 +304,17 @@
 	protected RulesType rules = RULES_EDEFAULT;
 
 	/**
-	 * This is true if the Rules attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Rules attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean rulesESet;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -335,9 +322,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -345,18 +332,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -364,9 +350,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -374,9 +360,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSummary() <em>Summary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSummary() <em>Summary</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSummary()
 	 * @generated
 	 * @ordered
@@ -384,9 +370,9 @@
 	protected static final String SUMMARY_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getSummary() <em>Summary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSummary() <em>Summary</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSummary()
 	 * @generated
 	 * @ordered
@@ -394,9 +380,9 @@
 	protected String summary = SUMMARY_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -404,9 +390,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -414,9 +400,9 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -424,9 +410,9 @@
 	protected static final Object WIDTH_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -434,8 +420,8 @@
 	protected Object width = WIDTH_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlTableTypeImpl() {
@@ -443,8 +429,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -453,8 +439,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlCaptionType getCaption() {
@@ -462,42 +448,46 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetCaption(XhtmlCaptionType newCaption, NotificationChain msgs) {
 		XhtmlCaptionType oldCaption = caption;
 		caption = newCaption;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TABLE_TYPE__CAPTION, oldCaption, newCaption);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TABLE_TYPE__CAPTION, oldCaption,
+					newCaption);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCaption(XhtmlCaptionType newCaption) {
 		if (newCaption != caption) {
 			NotificationChain msgs = null;
 			if (caption != null)
-				msgs = ((InternalEObject)caption).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - XhtmlPackage.XHTML_TABLE_TYPE__CAPTION, null, msgs);
+				msgs = ((InternalEObject) caption).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - XhtmlPackage.XHTML_TABLE_TYPE__CAPTION, null, msgs);
 			if (newCaption != null)
-				msgs = ((InternalEObject)newCaption).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - XhtmlPackage.XHTML_TABLE_TYPE__CAPTION, null, msgs);
+				msgs = ((InternalEObject) newCaption).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - XhtmlPackage.XHTML_TABLE_TYPE__CAPTION, null, msgs);
 			msgs = basicSetCaption(newCaption, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TABLE_TYPE__CAPTION, newCaption, newCaption));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlColType> getCol() {
@@ -508,8 +498,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlColgroupType> getColgroup() {
@@ -520,8 +510,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlTheadType getThead() {
@@ -529,8 +519,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetThead(XhtmlTheadType newThead, NotificationChain msgs) {
@@ -538,33 +528,36 @@
 		thead = newThead;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TABLE_TYPE__THEAD, oldThead, newThead);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setThead(XhtmlTheadType newThead) {
 		if (newThead != thead) {
 			NotificationChain msgs = null;
 			if (thead != null)
-				msgs = ((InternalEObject)thead).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - XhtmlPackage.XHTML_TABLE_TYPE__THEAD, null, msgs);
+				msgs = ((InternalEObject) thead).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - XhtmlPackage.XHTML_TABLE_TYPE__THEAD, null, msgs);
 			if (newThead != null)
-				msgs = ((InternalEObject)newThead).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - XhtmlPackage.XHTML_TABLE_TYPE__THEAD, null, msgs);
+				msgs = ((InternalEObject) newThead).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - XhtmlPackage.XHTML_TABLE_TYPE__THEAD, null, msgs);
 			msgs = basicSetThead(newThead, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TABLE_TYPE__THEAD, newThead, newThead));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlTfootType getTfoot() {
@@ -572,8 +565,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTfoot(XhtmlTfootType newTfoot, NotificationChain msgs) {
@@ -581,33 +574,36 @@
 		tfoot = newTfoot;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TABLE_TYPE__TFOOT, oldTfoot, newTfoot);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTfoot(XhtmlTfootType newTfoot) {
 		if (newTfoot != tfoot) {
 			NotificationChain msgs = null;
 			if (tfoot != null)
-				msgs = ((InternalEObject)tfoot).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - XhtmlPackage.XHTML_TABLE_TYPE__TFOOT, null, msgs);
+				msgs = ((InternalEObject) tfoot).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - XhtmlPackage.XHTML_TABLE_TYPE__TFOOT, null, msgs);
 			if (newTfoot != null)
-				msgs = ((InternalEObject)newTfoot).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - XhtmlPackage.XHTML_TABLE_TYPE__TFOOT, null, msgs);
+				msgs = ((InternalEObject) newTfoot).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - XhtmlPackage.XHTML_TABLE_TYPE__TFOOT, null, msgs);
 			msgs = basicSetTfoot(newTfoot, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TABLE_TYPE__TFOOT, newTfoot, newTfoot));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlTbodyType> getTbody() {
@@ -618,8 +614,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlTrType> getTr() {
@@ -630,8 +626,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger getBorder() {
@@ -639,8 +635,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBorder(BigInteger newBorder) {
@@ -651,8 +647,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getCellpadding() {
@@ -660,8 +656,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCellpadding(Object newCellpadding) {
@@ -672,8 +668,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getCellspacing() {
@@ -681,8 +677,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCellspacing(Object newCellspacing) {
@@ -693,8 +689,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -702,8 +698,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -714,8 +710,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FrameType getFrame() {
@@ -723,8 +719,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFrame(FrameType newFrame) {
@@ -737,8 +733,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetFrame() {
@@ -751,8 +747,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetFrame() {
@@ -760,8 +756,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -769,8 +765,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -781,8 +777,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -790,8 +786,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -802,8 +798,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RulesType getRules() {
@@ -811,8 +807,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRules(RulesType newRules) {
@@ -825,8 +821,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetRules() {
@@ -839,8 +835,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetRules() {
@@ -848,8 +844,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -857,8 +853,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -871,8 +867,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -885,8 +881,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -894,8 +890,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -903,8 +899,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -915,8 +911,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getSummary() {
@@ -924,8 +920,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSummary(String newSummary) {
@@ -936,8 +932,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -945,8 +941,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -957,8 +953,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getWidth() {
@@ -966,8 +962,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setWidth(Object newWidth) {
@@ -978,322 +974,332 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TABLE_TYPE__CAPTION:
-				return basicSetCaption(null, msgs);
-			case XhtmlPackage.XHTML_TABLE_TYPE__COL:
-				return ((InternalEList<?>)getCol()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TABLE_TYPE__COLGROUP:
-				return ((InternalEList<?>)getColgroup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TABLE_TYPE__THEAD:
-				return basicSetThead(null, msgs);
-			case XhtmlPackage.XHTML_TABLE_TYPE__TFOOT:
-				return basicSetTfoot(null, msgs);
-			case XhtmlPackage.XHTML_TABLE_TYPE__TBODY:
-				return ((InternalEList<?>)getTbody()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TABLE_TYPE__TR:
-				return ((InternalEList<?>)getTr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TABLE_TYPE__CAPTION:
+			return basicSetCaption(null, msgs);
+		case XhtmlPackage.XHTML_TABLE_TYPE__COL:
+			return ((InternalEList<?>) getCol()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TABLE_TYPE__COLGROUP:
+			return ((InternalEList<?>) getColgroup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TABLE_TYPE__THEAD:
+			return basicSetThead(null, msgs);
+		case XhtmlPackage.XHTML_TABLE_TYPE__TFOOT:
+			return basicSetTfoot(null, msgs);
+		case XhtmlPackage.XHTML_TABLE_TYPE__TBODY:
+			return ((InternalEList<?>) getTbody()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TABLE_TYPE__TR:
+			return ((InternalEList<?>) getTr()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TABLE_TYPE__CAPTION:
-				return getCaption();
-			case XhtmlPackage.XHTML_TABLE_TYPE__COL:
-				return getCol();
-			case XhtmlPackage.XHTML_TABLE_TYPE__COLGROUP:
-				return getColgroup();
-			case XhtmlPackage.XHTML_TABLE_TYPE__THEAD:
-				return getThead();
-			case XhtmlPackage.XHTML_TABLE_TYPE__TFOOT:
-				return getTfoot();
-			case XhtmlPackage.XHTML_TABLE_TYPE__TBODY:
-				return getTbody();
-			case XhtmlPackage.XHTML_TABLE_TYPE__TR:
-				return getTr();
-			case XhtmlPackage.XHTML_TABLE_TYPE__BORDER:
-				return getBorder();
-			case XhtmlPackage.XHTML_TABLE_TYPE__CELLPADDING:
-				return getCellpadding();
-			case XhtmlPackage.XHTML_TABLE_TYPE__CELLSPACING:
-				return getCellspacing();
-			case XhtmlPackage.XHTML_TABLE_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_TABLE_TYPE__FRAME:
-				return getFrame();
-			case XhtmlPackage.XHTML_TABLE_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_TABLE_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_TABLE_TYPE__RULES:
-				return getRules();
-			case XhtmlPackage.XHTML_TABLE_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_TABLE_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_TABLE_TYPE__SUMMARY:
-				return getSummary();
-			case XhtmlPackage.XHTML_TABLE_TYPE__TITLE:
-				return getTitle();
-			case XhtmlPackage.XHTML_TABLE_TYPE__WIDTH:
-				return getWidth();
+		case XhtmlPackage.XHTML_TABLE_TYPE__CAPTION:
+			return getCaption();
+		case XhtmlPackage.XHTML_TABLE_TYPE__COL:
+			return getCol();
+		case XhtmlPackage.XHTML_TABLE_TYPE__COLGROUP:
+			return getColgroup();
+		case XhtmlPackage.XHTML_TABLE_TYPE__THEAD:
+			return getThead();
+		case XhtmlPackage.XHTML_TABLE_TYPE__TFOOT:
+			return getTfoot();
+		case XhtmlPackage.XHTML_TABLE_TYPE__TBODY:
+			return getTbody();
+		case XhtmlPackage.XHTML_TABLE_TYPE__TR:
+			return getTr();
+		case XhtmlPackage.XHTML_TABLE_TYPE__BORDER:
+			return getBorder();
+		case XhtmlPackage.XHTML_TABLE_TYPE__CELLPADDING:
+			return getCellpadding();
+		case XhtmlPackage.XHTML_TABLE_TYPE__CELLSPACING:
+			return getCellspacing();
+		case XhtmlPackage.XHTML_TABLE_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_TABLE_TYPE__FRAME:
+			return getFrame();
+		case XhtmlPackage.XHTML_TABLE_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_TABLE_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_TABLE_TYPE__RULES:
+			return getRules();
+		case XhtmlPackage.XHTML_TABLE_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_TABLE_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_TABLE_TYPE__SUMMARY:
+			return getSummary();
+		case XhtmlPackage.XHTML_TABLE_TYPE__TITLE:
+			return getTitle();
+		case XhtmlPackage.XHTML_TABLE_TYPE__WIDTH:
+			return getWidth();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TABLE_TYPE__CAPTION:
-				setCaption((XhtmlCaptionType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__COL:
-				getCol().clear();
-				getCol().addAll((Collection<? extends XhtmlColType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__COLGROUP:
-				getColgroup().clear();
-				getColgroup().addAll((Collection<? extends XhtmlColgroupType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__THEAD:
-				setThead((XhtmlTheadType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__TFOOT:
-				setTfoot((XhtmlTfootType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__TBODY:
-				getTbody().clear();
-				getTbody().addAll((Collection<? extends XhtmlTbodyType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__TR:
-				getTr().clear();
-				getTr().addAll((Collection<? extends XhtmlTrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__BORDER:
-				setBorder((BigInteger)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__CELLPADDING:
-				setCellpadding(newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__CELLSPACING:
-				setCellspacing(newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__FRAME:
-				setFrame((FrameType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__RULES:
-				setRules((RulesType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__SUMMARY:
-				setSummary((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__WIDTH:
-				setWidth(newValue);
-				return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__CAPTION:
+			setCaption((XhtmlCaptionType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__COL:
+			getCol().clear();
+			getCol().addAll((Collection<? extends XhtmlColType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__COLGROUP:
+			getColgroup().clear();
+			getColgroup().addAll((Collection<? extends XhtmlColgroupType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__THEAD:
+			setThead((XhtmlTheadType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__TFOOT:
+			setTfoot((XhtmlTfootType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__TBODY:
+			getTbody().clear();
+			getTbody().addAll((Collection<? extends XhtmlTbodyType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__TR:
+			getTr().clear();
+			getTr().addAll((Collection<? extends XhtmlTrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__BORDER:
+			setBorder((BigInteger) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__CELLPADDING:
+			setCellpadding(newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__CELLSPACING:
+			setCellspacing(newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__FRAME:
+			setFrame((FrameType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__RULES:
+			setRules((RulesType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__SUMMARY:
+			setSummary((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__WIDTH:
+			setWidth(newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TABLE_TYPE__CAPTION:
-				setCaption((XhtmlCaptionType)null);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__COL:
-				getCol().clear();
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__COLGROUP:
-				getColgroup().clear();
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__THEAD:
-				setThead((XhtmlTheadType)null);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__TFOOT:
-				setTfoot((XhtmlTfootType)null);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__TBODY:
-				getTbody().clear();
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__TR:
-				getTr().clear();
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__BORDER:
-				setBorder(BORDER_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__CELLPADDING:
-				setCellpadding(CELLPADDING_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__CELLSPACING:
-				setCellspacing(CELLSPACING_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__FRAME:
-				unsetFrame();
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__RULES:
-				unsetRules();
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__SUMMARY:
-				setSummary(SUMMARY_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TABLE_TYPE__WIDTH:
-				setWidth(WIDTH_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__CAPTION:
+			setCaption((XhtmlCaptionType) null);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__COL:
+			getCol().clear();
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__COLGROUP:
+			getColgroup().clear();
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__THEAD:
+			setThead((XhtmlTheadType) null);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__TFOOT:
+			setTfoot((XhtmlTfootType) null);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__TBODY:
+			getTbody().clear();
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__TR:
+			getTr().clear();
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__BORDER:
+			setBorder(BORDER_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__CELLPADDING:
+			setCellpadding(CELLPADDING_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__CELLSPACING:
+			setCellspacing(CELLSPACING_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__FRAME:
+			unsetFrame();
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__RULES:
+			unsetRules();
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__SUMMARY:
+			setSummary(SUMMARY_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TABLE_TYPE__WIDTH:
+			setWidth(WIDTH_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TABLE_TYPE__CAPTION:
-				return caption != null;
-			case XhtmlPackage.XHTML_TABLE_TYPE__COL:
-				return col != null && !col.isEmpty();
-			case XhtmlPackage.XHTML_TABLE_TYPE__COLGROUP:
-				return colgroup != null && !colgroup.isEmpty();
-			case XhtmlPackage.XHTML_TABLE_TYPE__THEAD:
-				return thead != null;
-			case XhtmlPackage.XHTML_TABLE_TYPE__TFOOT:
-				return tfoot != null;
-			case XhtmlPackage.XHTML_TABLE_TYPE__TBODY:
-				return tbody != null && !tbody.isEmpty();
-			case XhtmlPackage.XHTML_TABLE_TYPE__TR:
-				return tr != null && !tr.isEmpty();
-			case XhtmlPackage.XHTML_TABLE_TYPE__BORDER:
-				return BORDER_EDEFAULT == null ? border != null : !BORDER_EDEFAULT.equals(border);
-			case XhtmlPackage.XHTML_TABLE_TYPE__CELLPADDING:
-				return CELLPADDING_EDEFAULT == null ? cellpadding != null : !CELLPADDING_EDEFAULT.equals(cellpadding);
-			case XhtmlPackage.XHTML_TABLE_TYPE__CELLSPACING:
-				return CELLSPACING_EDEFAULT == null ? cellspacing != null : !CELLSPACING_EDEFAULT.equals(cellspacing);
-			case XhtmlPackage.XHTML_TABLE_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_TABLE_TYPE__FRAME:
-				return isSetFrame();
-			case XhtmlPackage.XHTML_TABLE_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_TABLE_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_TABLE_TYPE__RULES:
-				return isSetRules();
-			case XhtmlPackage.XHTML_TABLE_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_TABLE_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_TABLE_TYPE__SUMMARY:
-				return SUMMARY_EDEFAULT == null ? summary != null : !SUMMARY_EDEFAULT.equals(summary);
-			case XhtmlPackage.XHTML_TABLE_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-			case XhtmlPackage.XHTML_TABLE_TYPE__WIDTH:
-				return WIDTH_EDEFAULT == null ? width != null : !WIDTH_EDEFAULT.equals(width);
+		case XhtmlPackage.XHTML_TABLE_TYPE__CAPTION:
+			return caption != null;
+		case XhtmlPackage.XHTML_TABLE_TYPE__COL:
+			return col != null && !col.isEmpty();
+		case XhtmlPackage.XHTML_TABLE_TYPE__COLGROUP:
+			return colgroup != null && !colgroup.isEmpty();
+		case XhtmlPackage.XHTML_TABLE_TYPE__THEAD:
+			return thead != null;
+		case XhtmlPackage.XHTML_TABLE_TYPE__TFOOT:
+			return tfoot != null;
+		case XhtmlPackage.XHTML_TABLE_TYPE__TBODY:
+			return tbody != null && !tbody.isEmpty();
+		case XhtmlPackage.XHTML_TABLE_TYPE__TR:
+			return tr != null && !tr.isEmpty();
+		case XhtmlPackage.XHTML_TABLE_TYPE__BORDER:
+			return BORDER_EDEFAULT == null ? border != null : !BORDER_EDEFAULT.equals(border);
+		case XhtmlPackage.XHTML_TABLE_TYPE__CELLPADDING:
+			return CELLPADDING_EDEFAULT == null ? cellpadding != null : !CELLPADDING_EDEFAULT.equals(cellpadding);
+		case XhtmlPackage.XHTML_TABLE_TYPE__CELLSPACING:
+			return CELLSPACING_EDEFAULT == null ? cellspacing != null : !CELLSPACING_EDEFAULT.equals(cellspacing);
+		case XhtmlPackage.XHTML_TABLE_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_TABLE_TYPE__FRAME:
+			return isSetFrame();
+		case XhtmlPackage.XHTML_TABLE_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_TABLE_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_TABLE_TYPE__RULES:
+			return isSetRules();
+		case XhtmlPackage.XHTML_TABLE_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_TABLE_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_TABLE_TYPE__SUMMARY:
+			return SUMMARY_EDEFAULT == null ? summary != null : !SUMMARY_EDEFAULT.equals(summary);
+		case XhtmlPackage.XHTML_TABLE_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_TABLE_TYPE__WIDTH:
+			return WIDTH_EDEFAULT == null ? width != null : !WIDTH_EDEFAULT.equals(width);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (border: ");
+		result.append(" (border: "); //$NON-NLS-1$
 		result.append(border);
-		result.append(", cellpadding: ");
+		result.append(", cellpadding: "); //$NON-NLS-1$
 		result.append(cellpadding);
-		result.append(", cellspacing: ");
+		result.append(", cellspacing: "); //$NON-NLS-1$
 		result.append(cellspacing);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", frame: ");
-		if (frameESet) result.append(frame); else result.append("<unset>");
-		result.append(", id: ");
+		result.append(", frame: "); //$NON-NLS-1$
+		if (frameESet)
+			result.append(frame);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", rules: ");
-		if (rulesESet) result.append(rules); else result.append("<unset>");
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", rules: "); //$NON-NLS-1$
+		if (rulesESet)
+			result.append(rules);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", summary: ");
+		result.append(", summary: "); //$NON-NLS-1$
 		result.append(summary);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
-		result.append(", width: ");
+		result.append(", width: "); //$NON-NLS-1$
 		result.append(width);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlTableTypeImpl
+} // XhtmlTableTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTbodyTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTbodyTypeImpl.java
index b74943d..1e53eee 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTbodyTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTbodyTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,20 +15,14 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.AlignType;
 import org.eclipse.rmf.reqif10.xhtml.ValignType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
@@ -36,33 +30,31 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlTrType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tbody Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Tbody Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getTr <em>Tr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getAlign <em>Align</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getChar <em>Char</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getCharoff <em>Charoff</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getValign <em>Valign</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getTr <em>Tr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getAlign <em>Align</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getChar <em>Char</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getCharoff <em>Charoff</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTbodyTypeImpl#getValign <em>Valign</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlTbodyTypeImpl extends EObjectImpl implements XhtmlTbodyType {
+public class XhtmlTbodyTypeImpl extends MinimalEObjectImpl implements XhtmlTbodyType {
 	/**
-	 * The cached value of the '{@link #getTr() <em>Tr</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTr() <em>Tr</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTr()
 	 * @generated
 	 * @ordered
@@ -70,9 +62,9 @@
 	protected EList<XhtmlTrType> tr;
 
 	/**
-	 * The default value of the '{@link #getAlign() <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAlign() <em>Align</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAlign()
 	 * @generated
 	 * @ordered
@@ -80,9 +72,9 @@
 	protected static final AlignType ALIGN_EDEFAULT = AlignType.LEFT;
 
 	/**
-	 * The cached value of the '{@link #getAlign() <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAlign() <em>Align</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getAlign()
 	 * @generated
 	 * @ordered
@@ -90,18 +82,17 @@
 	protected AlignType align = ALIGN_EDEFAULT;
 
 	/**
-	 * This is true if the Align attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Align attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean alignESet;
 
 	/**
-	 * The default value of the '{@link #getChar() <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getChar() <em>Char</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getChar()
 	 * @generated
 	 * @ordered
@@ -109,9 +100,9 @@
 	protected static final String CHAR_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getChar() <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getChar() <em>Char</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getChar()
 	 * @generated
 	 * @ordered
@@ -119,9 +110,9 @@
 	protected String char_ = CHAR_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCharoff() <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCharoff() <em>Charoff</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharoff()
 	 * @generated
 	 * @ordered
@@ -129,9 +120,9 @@
 	protected static final Object CHAROFF_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCharoff() <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCharoff() <em>Charoff</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharoff()
 	 * @generated
 	 * @ordered
@@ -139,9 +130,9 @@
 	protected Object charoff = CHAROFF_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -149,9 +140,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -159,9 +150,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -169,9 +159,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -179,9 +168,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -189,9 +178,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -199,9 +188,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -209,9 +198,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -219,18 +208,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -238,9 +226,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -248,9 +236,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -258,9 +246,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -268,9 +256,9 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getValign() <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValign() <em>Valign</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValign()
 	 * @generated
 	 * @ordered
@@ -278,9 +266,9 @@
 	protected static final ValignType VALIGN_EDEFAULT = ValignType.TOP;
 
 	/**
-	 * The cached value of the '{@link #getValign() <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getValign() <em>Valign</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValign()
 	 * @generated
 	 * @ordered
@@ -288,17 +276,16 @@
 	protected ValignType valign = VALIGN_EDEFAULT;
 
 	/**
-	 * This is true if the Valign attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Valign attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean valignESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlTbodyTypeImpl() {
@@ -306,8 +293,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -316,8 +303,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlTrType> getTr() {
@@ -328,8 +315,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AlignType getAlign() {
@@ -337,8 +324,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAlign(AlignType newAlign) {
@@ -351,8 +338,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetAlign() {
@@ -365,8 +352,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetAlign() {
@@ -374,8 +361,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getChar() {
@@ -383,8 +370,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setChar(String newChar) {
@@ -395,8 +382,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getCharoff() {
@@ -404,8 +391,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCharoff(Object newCharoff) {
@@ -416,8 +403,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -425,8 +412,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -437,8 +424,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -446,8 +433,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -458,8 +445,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -467,8 +454,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -479,8 +466,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -488,8 +475,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -502,8 +489,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -516,8 +503,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -525,8 +512,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -534,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -546,8 +533,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -555,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -567,8 +554,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ValignType getValign() {
@@ -576,8 +563,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValign(ValignType newValign) {
@@ -590,8 +577,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetValign() {
@@ -604,8 +591,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetValign() {
@@ -613,211 +600,221 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TBODY_TYPE__TR:
-				return ((InternalEList<?>)getTr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TBODY_TYPE__TR:
+			return ((InternalEList<?>) getTr()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TBODY_TYPE__TR:
-				return getTr();
-			case XhtmlPackage.XHTML_TBODY_TYPE__ALIGN:
-				return getAlign();
-			case XhtmlPackage.XHTML_TBODY_TYPE__CHAR:
-				return getChar();
-			case XhtmlPackage.XHTML_TBODY_TYPE__CHAROFF:
-				return getCharoff();
-			case XhtmlPackage.XHTML_TBODY_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_TBODY_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_TBODY_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_TBODY_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_TBODY_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_TBODY_TYPE__TITLE:
-				return getTitle();
-			case XhtmlPackage.XHTML_TBODY_TYPE__VALIGN:
-				return getValign();
+		case XhtmlPackage.XHTML_TBODY_TYPE__TR:
+			return getTr();
+		case XhtmlPackage.XHTML_TBODY_TYPE__ALIGN:
+			return getAlign();
+		case XhtmlPackage.XHTML_TBODY_TYPE__CHAR:
+			return getChar();
+		case XhtmlPackage.XHTML_TBODY_TYPE__CHAROFF:
+			return getCharoff();
+		case XhtmlPackage.XHTML_TBODY_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_TBODY_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_TBODY_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_TBODY_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_TBODY_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_TBODY_TYPE__TITLE:
+			return getTitle();
+		case XhtmlPackage.XHTML_TBODY_TYPE__VALIGN:
+			return getValign();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TBODY_TYPE__TR:
-				getTr().clear();
-				getTr().addAll((Collection<? extends XhtmlTrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__ALIGN:
-				setAlign((AlignType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__CHAR:
-				setChar((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__CHAROFF:
-				setCharoff(newValue);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__VALIGN:
-				setValign((ValignType)newValue);
-				return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__TR:
+			getTr().clear();
+			getTr().addAll((Collection<? extends XhtmlTrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__ALIGN:
+			setAlign((AlignType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__CHAR:
+			setChar((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__CHAROFF:
+			setCharoff(newValue);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__VALIGN:
+			setValign((ValignType) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TBODY_TYPE__TR:
-				getTr().clear();
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__ALIGN:
-				unsetAlign();
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__CHAR:
-				setChar(CHAR_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__CHAROFF:
-				setCharoff(CHAROFF_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TBODY_TYPE__VALIGN:
-				unsetValign();
-				return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__TR:
+			getTr().clear();
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__ALIGN:
+			unsetAlign();
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__CHAR:
+			setChar(CHAR_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__CHAROFF:
+			setCharoff(CHAROFF_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TBODY_TYPE__VALIGN:
+			unsetValign();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TBODY_TYPE__TR:
-				return tr != null && !tr.isEmpty();
-			case XhtmlPackage.XHTML_TBODY_TYPE__ALIGN:
-				return isSetAlign();
-			case XhtmlPackage.XHTML_TBODY_TYPE__CHAR:
-				return CHAR_EDEFAULT == null ? char_ != null : !CHAR_EDEFAULT.equals(char_);
-			case XhtmlPackage.XHTML_TBODY_TYPE__CHAROFF:
-				return CHAROFF_EDEFAULT == null ? charoff != null : !CHAROFF_EDEFAULT.equals(charoff);
-			case XhtmlPackage.XHTML_TBODY_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_TBODY_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_TBODY_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_TBODY_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_TBODY_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_TBODY_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-			case XhtmlPackage.XHTML_TBODY_TYPE__VALIGN:
-				return isSetValign();
+		case XhtmlPackage.XHTML_TBODY_TYPE__TR:
+			return tr != null && !tr.isEmpty();
+		case XhtmlPackage.XHTML_TBODY_TYPE__ALIGN:
+			return isSetAlign();
+		case XhtmlPackage.XHTML_TBODY_TYPE__CHAR:
+			return CHAR_EDEFAULT == null ? char_ != null : !CHAR_EDEFAULT.equals(char_);
+		case XhtmlPackage.XHTML_TBODY_TYPE__CHAROFF:
+			return CHAROFF_EDEFAULT == null ? charoff != null : !CHAROFF_EDEFAULT.equals(charoff);
+		case XhtmlPackage.XHTML_TBODY_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_TBODY_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_TBODY_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_TBODY_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_TBODY_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_TBODY_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_TBODY_TYPE__VALIGN:
+			return isSetValign();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (align: ");
-		if (alignESet) result.append(align); else result.append("<unset>");
-		result.append(", char: ");
+		result.append(" (align: "); //$NON-NLS-1$
+		if (alignESet)
+			result.append(align);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", char: "); //$NON-NLS-1$
 		result.append(char_);
-		result.append(", charoff: ");
+		result.append(", charoff: "); //$NON-NLS-1$
 		result.append(charoff);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
-		result.append(", valign: ");
-		if (valignESet) result.append(valign); else result.append("<unset>");
+		result.append(", valign: "); //$NON-NLS-1$
+		if (valignESet)
+			result.append(valign);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlTbodyTypeImpl
+} // XhtmlTbodyTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTdTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTdTypeImpl.java
index 14cac47..6f0c79a 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTdTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTdTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,27 +12,20 @@
 package org.eclipse.rmf.reqif10.xhtml.impl;
 
 import java.math.BigInteger;
-
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.AlignType;
 import org.eclipse.rmf.reqif10.xhtml.ScopeType;
 import org.eclipse.rmf.reqif10.xhtml.ValignType;
@@ -73,80 +66,78 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Td Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Td Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getH1 <em>H1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getH2 <em>H2</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getH3 <em>H3</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getH4 <em>H4</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getH5 <em>H5</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getH6 <em>H6</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getUl <em>Ul</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getOl <em>Ol</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getDl <em>Dl</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getPre <em>Pre</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getBlockquote <em>Blockquote</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getHr <em>Hr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getAbbr1 <em>Abbr1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getAlign <em>Align</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getAxis <em>Axis</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getChar <em>Char</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getCharoff <em>Charoff</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getColspan <em>Colspan</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getHeaders <em>Headers</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getRowspan <em>Rowspan</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getScope <em>Scope</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getValign <em>Valign</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getH1 <em>H1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getH2 <em>H2</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getH3 <em>H3</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getH4 <em>H4</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getH5 <em>H5</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getH6 <em>H6</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getUl <em>Ul</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getOl <em>Ol</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getDl <em>Dl</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getPre <em>Pre</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getBlockquote <em>Blockquote</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getAddress <em>Address</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getHr <em>Hr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getAbbr1 <em>Abbr1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getAlign <em>Align</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getAxis <em>Axis</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getChar <em>Char</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getCharoff <em>Charoff</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getColspan <em>Colspan</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getHeaders <em>Headers</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getRowspan <em>Rowspan</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getScope <em>Scope</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTdTypeImpl#getValign <em>Valign</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlTdTypeImpl extends EObjectImpl implements XhtmlTdType {
+public class XhtmlTdTypeImpl extends MinimalEObjectImpl implements XhtmlTdType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -154,9 +145,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getAbbr1() <em>Abbr1</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAbbr1() <em>Abbr1</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAbbr1()
 	 * @generated
 	 * @ordered
@@ -164,9 +155,9 @@
 	protected static final String ABBR1_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getAbbr1() <em>Abbr1</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAbbr1() <em>Abbr1</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getAbbr1()
 	 * @generated
 	 * @ordered
@@ -174,9 +165,9 @@
 	protected String abbr1 = ABBR1_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getAlign() <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAlign() <em>Align</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAlign()
 	 * @generated
 	 * @ordered
@@ -184,9 +175,9 @@
 	protected static final AlignType ALIGN_EDEFAULT = AlignType.LEFT;
 
 	/**
-	 * The cached value of the '{@link #getAlign() <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAlign() <em>Align</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getAlign()
 	 * @generated
 	 * @ordered
@@ -194,18 +185,17 @@
 	protected AlignType align = ALIGN_EDEFAULT;
 
 	/**
-	 * This is true if the Align attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Align attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean alignESet;
 
 	/**
-	 * The default value of the '{@link #getAxis() <em>Axis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAxis() <em>Axis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getAxis()
 	 * @generated
 	 * @ordered
@@ -213,9 +203,9 @@
 	protected static final String AXIS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getAxis() <em>Axis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAxis() <em>Axis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getAxis()
 	 * @generated
 	 * @ordered
@@ -223,9 +213,9 @@
 	protected String axis = AXIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getChar() <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getChar() <em>Char</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getChar()
 	 * @generated
 	 * @ordered
@@ -233,9 +223,9 @@
 	protected static final String CHAR_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getChar() <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getChar() <em>Char</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getChar()
 	 * @generated
 	 * @ordered
@@ -243,9 +233,9 @@
 	protected String char_ = CHAR_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCharoff() <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCharoff() <em>Charoff</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharoff()
 	 * @generated
 	 * @ordered
@@ -253,9 +243,9 @@
 	protected static final Object CHAROFF_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCharoff() <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCharoff() <em>Charoff</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharoff()
 	 * @generated
 	 * @ordered
@@ -263,9 +253,9 @@
 	protected Object charoff = CHAROFF_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -273,9 +263,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -283,19 +273,19 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getColspan() <em>Colspan</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getColspan() <em>Colspan</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getColspan()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final BigInteger COLSPAN_EDEFAULT = new BigInteger("1");
+	protected static final BigInteger COLSPAN_EDEFAULT = new BigInteger("1"); //$NON-NLS-1$
 
 	/**
-	 * The cached value of the '{@link #getColspan() <em>Colspan</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getColspan() <em>Colspan</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getColspan()
 	 * @generated
 	 * @ordered
@@ -303,18 +293,17 @@
 	protected BigInteger colspan = COLSPAN_EDEFAULT;
 
 	/**
-	 * This is true if the Colspan attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Colspan attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean colspanESet;
 
 	/**
-	 * The default value of the '{@link #getHeaders() <em>Headers</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getHeaders() <em>Headers</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getHeaders()
 	 * @generated
 	 * @ordered
@@ -322,9 +311,9 @@
 	protected static final List<String> HEADERS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getHeaders() <em>Headers</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHeaders() <em>Headers</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getHeaders()
 	 * @generated
 	 * @ordered
@@ -332,9 +321,8 @@
 	protected List<String> headers = HEADERS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -342,9 +330,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -352,9 +339,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -362,9 +349,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -372,19 +359,19 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getRowspan() <em>Rowspan</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getRowspan() <em>Rowspan</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getRowspan()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final BigInteger ROWSPAN_EDEFAULT = new BigInteger("1");
+	protected static final BigInteger ROWSPAN_EDEFAULT = new BigInteger("1"); //$NON-NLS-1$
 
 	/**
-	 * The cached value of the '{@link #getRowspan() <em>Rowspan</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getRowspan() <em>Rowspan</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getRowspan()
 	 * @generated
 	 * @ordered
@@ -392,18 +379,17 @@
 	protected BigInteger rowspan = ROWSPAN_EDEFAULT;
 
 	/**
-	 * This is true if the Rowspan attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Rowspan attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean rowspanESet;
 
 	/**
-	 * The default value of the '{@link #getScope() <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getScope() <em>Scope</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getScope()
 	 * @generated
 	 * @ordered
@@ -411,9 +397,9 @@
 	protected static final ScopeType SCOPE_EDEFAULT = ScopeType.ROW;
 
 	/**
-	 * The cached value of the '{@link #getScope() <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getScope() <em>Scope</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getScope()
 	 * @generated
 	 * @ordered
@@ -421,18 +407,17 @@
 	protected ScopeType scope = SCOPE_EDEFAULT;
 
 	/**
-	 * This is true if the Scope attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Scope attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean scopeESet;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -440,9 +425,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -450,18 +435,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -469,9 +453,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -479,9 +463,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -489,9 +473,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -499,9 +483,9 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getValign() <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValign() <em>Valign</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValign()
 	 * @generated
 	 * @ordered
@@ -509,9 +493,9 @@
 	protected static final ValignType VALIGN_EDEFAULT = ValignType.TOP;
 
 	/**
-	 * The cached value of the '{@link #getValign() <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getValign() <em>Valign</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValign()
 	 * @generated
 	 * @ordered
@@ -519,17 +503,16 @@
 	protected ValignType valign = VALIGN_EDEFAULT;
 
 	/**
-	 * This is true if the Valign attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Valign attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean valignESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlTdTypeImpl() {
@@ -537,8 +520,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -547,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -559,17 +542,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlFlowMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlTdType_XhtmlFlowMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlTdType_XhtmlFlowMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH1Type> getH1() {
@@ -577,8 +560,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH2Type> getH2() {
@@ -586,8 +569,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH3Type> getH3() {
@@ -595,8 +578,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH4Type> getH4() {
@@ -604,8 +587,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH5Type> getH5() {
@@ -613,8 +596,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH6Type> getH6() {
@@ -622,8 +605,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlUlType> getUl() {
@@ -631,8 +614,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlOlType> getOl() {
@@ -640,8 +623,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDlType> getDl() {
@@ -649,8 +632,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlPType> getP() {
@@ -658,8 +641,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDivType> getDiv() {
@@ -667,8 +650,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlPreType> getPre() {
@@ -676,8 +659,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBlockquoteType> getBlockquote() {
@@ -685,8 +668,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAddressType> getAddress() {
@@ -694,8 +677,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlHrType> getHr() {
@@ -703,8 +686,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlTableType> getTable() {
@@ -712,8 +695,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -721,8 +704,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -730,8 +713,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -739,8 +722,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -748,8 +731,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -757,8 +740,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -766,8 +749,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -775,8 +758,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -784,8 +767,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -793,8 +776,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -802,8 +785,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -811,8 +794,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -820,8 +803,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -829,8 +812,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -838,8 +821,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -847,8 +830,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -856,8 +839,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -865,8 +848,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -874,8 +857,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -883,8 +866,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -892,8 +875,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -901,8 +884,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -910,8 +893,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -919,8 +902,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -928,8 +911,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getAbbr1() {
@@ -937,20 +920,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAbbr1(String newAbbr1) {
 		String oldAbbr1 = abbr1;
 		abbr1 = newAbbr1;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TD_TYPE__ABBR1, oldAbbr1, abbr1));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AlignType getAlign() {
@@ -958,8 +942,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAlign(AlignType newAlign) {
@@ -967,13 +951,14 @@
 		align = newAlign == null ? ALIGN_EDEFAULT : newAlign;
 		boolean oldAlignESet = alignESet;
 		alignESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TD_TYPE__ALIGN, oldAlign, align, !oldAlignESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetAlign() {
@@ -981,13 +966,14 @@
 		boolean oldAlignESet = alignESet;
 		align = ALIGN_EDEFAULT;
 		alignESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_TD_TYPE__ALIGN, oldAlign, ALIGN_EDEFAULT, oldAlignESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetAlign() {
@@ -995,8 +981,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getAxis() {
@@ -1004,20 +990,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAxis(String newAxis) {
 		String oldAxis = axis;
 		axis = newAxis;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TD_TYPE__AXIS, oldAxis, axis));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getChar() {
@@ -1025,20 +1012,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setChar(String newChar) {
 		String oldChar = char_;
 		char_ = newChar;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TD_TYPE__CHAR, oldChar, char_));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getCharoff() {
@@ -1046,20 +1034,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCharoff(Object newCharoff) {
 		Object oldCharoff = charoff;
 		charoff = newCharoff;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TD_TYPE__CHAROFF, oldCharoff, charoff));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -1067,20 +1056,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
 		String oldClass = class_;
 		class_ = newClass;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TD_TYPE__CLASS, oldClass, class_));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger getColspan() {
@@ -1088,8 +1078,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setColspan(BigInteger newColspan) {
@@ -1097,13 +1087,14 @@
 		colspan = newColspan;
 		boolean oldColspanESet = colspanESet;
 		colspanESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TD_TYPE__COLSPAN, oldColspan, colspan, !oldColspanESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetColspan() {
@@ -1111,13 +1102,14 @@
 		boolean oldColspanESet = colspanESet;
 		colspan = COLSPAN_EDEFAULT;
 		colspanESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_TD_TYPE__COLSPAN, oldColspan, COLSPAN_EDEFAULT, oldColspanESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetColspan() {
@@ -1125,8 +1117,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public List<String> getHeaders() {
@@ -1134,20 +1126,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHeaders(List<String> newHeaders) {
 		List<String> oldHeaders = headers;
 		headers = newHeaders;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TD_TYPE__HEADERS, oldHeaders, headers));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -1155,20 +1148,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
 		String oldId = id;
 		id = newId;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TD_TYPE__ID, oldId, id));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -1176,20 +1170,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
 		String oldLang = lang;
 		lang = newLang;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TD_TYPE__LANG, oldLang, lang));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger getRowspan() {
@@ -1197,8 +1192,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRowspan(BigInteger newRowspan) {
@@ -1206,13 +1201,14 @@
 		rowspan = newRowspan;
 		boolean oldRowspanESet = rowspanESet;
 		rowspanESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TD_TYPE__ROWSPAN, oldRowspan, rowspan, !oldRowspanESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetRowspan() {
@@ -1220,13 +1216,14 @@
 		boolean oldRowspanESet = rowspanESet;
 		rowspan = ROWSPAN_EDEFAULT;
 		rowspanESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_TD_TYPE__ROWSPAN, oldRowspan, ROWSPAN_EDEFAULT, oldRowspanESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetRowspan() {
@@ -1234,8 +1231,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ScopeType getScope() {
@@ -1243,8 +1240,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setScope(ScopeType newScope) {
@@ -1252,13 +1249,14 @@
 		scope = newScope == null ? SCOPE_EDEFAULT : newScope;
 		boolean oldScopeESet = scopeESet;
 		scopeESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TD_TYPE__SCOPE, oldScope, scope, !oldScopeESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetScope() {
@@ -1266,13 +1264,14 @@
 		boolean oldScopeESet = scopeESet;
 		scope = SCOPE_EDEFAULT;
 		scopeESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_TD_TYPE__SCOPE, oldScope, SCOPE_EDEFAULT, oldScopeESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetScope() {
@@ -1280,8 +1279,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -1289,8 +1288,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -1298,13 +1297,14 @@
 		space = newSpace == null ? SPACE_EDEFAULT : newSpace;
 		boolean oldSpaceESet = spaceESet;
 		spaceESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TD_TYPE__SPACE, oldSpace, space, !oldSpaceESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -1312,13 +1312,14 @@
 		boolean oldSpaceESet = spaceESet;
 		space = SPACE_EDEFAULT;
 		spaceESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_TD_TYPE__SPACE, oldSpace, SPACE_EDEFAULT, oldSpaceESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -1326,8 +1327,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -1335,20 +1336,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
 		String oldStyle = style;
 		style = newStyle;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TD_TYPE__STYLE, oldStyle, style));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -1356,20 +1358,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
 		String oldTitle = title;
 		title = newTitle;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TD_TYPE__TITLE, oldTitle, title));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ValignType getValign() {
@@ -1377,8 +1380,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValign(ValignType newValign) {
@@ -1386,13 +1389,14 @@
 		valign = newValign == null ? VALIGN_EDEFAULT : newValign;
 		boolean oldValignESet = valignESet;
 		valignESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TD_TYPE__VALIGN, oldValign, valign, !oldValignESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetValign() {
@@ -1400,13 +1404,14 @@
 		boolean oldValignESet = valignESet;
 		valign = VALIGN_EDEFAULT;
 		valignESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_TD_TYPE__VALIGN, oldValign, VALIGN_EDEFAULT, oldValignESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetValign() {
@@ -1414,818 +1419,848 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TD_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__XHTML_FLOW_MIX:
-				return ((InternalEList<?>)getXhtmlFlowMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__H1:
-				return ((InternalEList<?>)getH1()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__H2:
-				return ((InternalEList<?>)getH2()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__H3:
-				return ((InternalEList<?>)getH3()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__H4:
-				return ((InternalEList<?>)getH4()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__H5:
-				return ((InternalEList<?>)getH5()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__H6:
-				return ((InternalEList<?>)getH6()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__UL:
-				return ((InternalEList<?>)getUl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__OL:
-				return ((InternalEList<?>)getOl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__DL:
-				return ((InternalEList<?>)getDl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__P:
-				return ((InternalEList<?>)getP()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__DIV:
-				return ((InternalEList<?>)getDiv()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__PRE:
-				return ((InternalEList<?>)getPre()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__BLOCKQUOTE:
-				return ((InternalEList<?>)getBlockquote()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__ADDRESS:
-				return ((InternalEList<?>)getAddress()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__HR:
-				return ((InternalEList<?>)getHr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__TABLE:
-				return ((InternalEList<?>)getTable()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TD_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__XHTML_FLOW_MIX:
+			return ((InternalEList<?>) getXhtmlFlowMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__H1:
+			return ((InternalEList<?>) getH1()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__H2:
+			return ((InternalEList<?>) getH2()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__H3:
+			return ((InternalEList<?>) getH3()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__H4:
+			return ((InternalEList<?>) getH4()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__H5:
+			return ((InternalEList<?>) getH5()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__H6:
+			return ((InternalEList<?>) getH6()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__UL:
+			return ((InternalEList<?>) getUl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__OL:
+			return ((InternalEList<?>) getOl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__DL:
+			return ((InternalEList<?>) getDl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__P:
+			return ((InternalEList<?>) getP()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__DIV:
+			return ((InternalEList<?>) getDiv()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__PRE:
+			return ((InternalEList<?>) getPre()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__BLOCKQUOTE:
+			return ((InternalEList<?>) getBlockquote()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__ADDRESS:
+			return ((InternalEList<?>) getAddress()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__HR:
+			return ((InternalEList<?>) getHr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__TABLE:
+			return ((InternalEList<?>) getTable()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TD_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TD_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_TD_TYPE__XHTML_FLOW_MIX:
-				if (coreType) return getXhtmlFlowMix();
-				return ((FeatureMap.Internal)getXhtmlFlowMix()).getWrapper();
-			case XhtmlPackage.XHTML_TD_TYPE__H1:
-				return getH1();
-			case XhtmlPackage.XHTML_TD_TYPE__H2:
-				return getH2();
-			case XhtmlPackage.XHTML_TD_TYPE__H3:
-				return getH3();
-			case XhtmlPackage.XHTML_TD_TYPE__H4:
-				return getH4();
-			case XhtmlPackage.XHTML_TD_TYPE__H5:
-				return getH5();
-			case XhtmlPackage.XHTML_TD_TYPE__H6:
-				return getH6();
-			case XhtmlPackage.XHTML_TD_TYPE__UL:
-				return getUl();
-			case XhtmlPackage.XHTML_TD_TYPE__OL:
-				return getOl();
-			case XhtmlPackage.XHTML_TD_TYPE__DL:
-				return getDl();
-			case XhtmlPackage.XHTML_TD_TYPE__P:
-				return getP();
-			case XhtmlPackage.XHTML_TD_TYPE__DIV:
-				return getDiv();
-			case XhtmlPackage.XHTML_TD_TYPE__PRE:
-				return getPre();
-			case XhtmlPackage.XHTML_TD_TYPE__BLOCKQUOTE:
-				return getBlockquote();
-			case XhtmlPackage.XHTML_TD_TYPE__ADDRESS:
-				return getAddress();
-			case XhtmlPackage.XHTML_TD_TYPE__HR:
-				return getHr();
-			case XhtmlPackage.XHTML_TD_TYPE__TABLE:
-				return getTable();
-			case XhtmlPackage.XHTML_TD_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_TD_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_TD_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_TD_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_TD_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_TD_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_TD_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_TD_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_TD_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_TD_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_TD_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_TD_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_TD_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_TD_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_TD_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_TD_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_TD_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_TD_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_TD_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_TD_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_TD_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_TD_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_TD_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_TD_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_TD_TYPE__ABBR1:
-				return getAbbr1();
-			case XhtmlPackage.XHTML_TD_TYPE__ALIGN:
-				return getAlign();
-			case XhtmlPackage.XHTML_TD_TYPE__AXIS:
-				return getAxis();
-			case XhtmlPackage.XHTML_TD_TYPE__CHAR:
-				return getChar();
-			case XhtmlPackage.XHTML_TD_TYPE__CHAROFF:
-				return getCharoff();
-			case XhtmlPackage.XHTML_TD_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_TD_TYPE__COLSPAN:
-				return getColspan();
-			case XhtmlPackage.XHTML_TD_TYPE__HEADERS:
-				return getHeaders();
-			case XhtmlPackage.XHTML_TD_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_TD_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_TD_TYPE__ROWSPAN:
-				return getRowspan();
-			case XhtmlPackage.XHTML_TD_TYPE__SCOPE:
-				return getScope();
-			case XhtmlPackage.XHTML_TD_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_TD_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_TD_TYPE__TITLE:
-				return getTitle();
-			case XhtmlPackage.XHTML_TD_TYPE__VALIGN:
-				return getValign();
+		case XhtmlPackage.XHTML_TD_TYPE__MIXED:
+			if (coreType) {
+				return getMixed();
+			}
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_TD_TYPE__XHTML_FLOW_MIX:
+			if (coreType) {
+				return getXhtmlFlowMix();
+			}
+			return ((FeatureMap.Internal) getXhtmlFlowMix()).getWrapper();
+		case XhtmlPackage.XHTML_TD_TYPE__H1:
+			return getH1();
+		case XhtmlPackage.XHTML_TD_TYPE__H2:
+			return getH2();
+		case XhtmlPackage.XHTML_TD_TYPE__H3:
+			return getH3();
+		case XhtmlPackage.XHTML_TD_TYPE__H4:
+			return getH4();
+		case XhtmlPackage.XHTML_TD_TYPE__H5:
+			return getH5();
+		case XhtmlPackage.XHTML_TD_TYPE__H6:
+			return getH6();
+		case XhtmlPackage.XHTML_TD_TYPE__UL:
+			return getUl();
+		case XhtmlPackage.XHTML_TD_TYPE__OL:
+			return getOl();
+		case XhtmlPackage.XHTML_TD_TYPE__DL:
+			return getDl();
+		case XhtmlPackage.XHTML_TD_TYPE__P:
+			return getP();
+		case XhtmlPackage.XHTML_TD_TYPE__DIV:
+			return getDiv();
+		case XhtmlPackage.XHTML_TD_TYPE__PRE:
+			return getPre();
+		case XhtmlPackage.XHTML_TD_TYPE__BLOCKQUOTE:
+			return getBlockquote();
+		case XhtmlPackage.XHTML_TD_TYPE__ADDRESS:
+			return getAddress();
+		case XhtmlPackage.XHTML_TD_TYPE__HR:
+			return getHr();
+		case XhtmlPackage.XHTML_TD_TYPE__TABLE:
+			return getTable();
+		case XhtmlPackage.XHTML_TD_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_TD_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_TD_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_TD_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_TD_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_TD_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_TD_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_TD_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_TD_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_TD_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_TD_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_TD_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_TD_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_TD_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_TD_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_TD_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_TD_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_TD_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_TD_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_TD_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_TD_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_TD_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_TD_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_TD_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_TD_TYPE__ABBR1:
+			return getAbbr1();
+		case XhtmlPackage.XHTML_TD_TYPE__ALIGN:
+			return getAlign();
+		case XhtmlPackage.XHTML_TD_TYPE__AXIS:
+			return getAxis();
+		case XhtmlPackage.XHTML_TD_TYPE__CHAR:
+			return getChar();
+		case XhtmlPackage.XHTML_TD_TYPE__CHAROFF:
+			return getCharoff();
+		case XhtmlPackage.XHTML_TD_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_TD_TYPE__COLSPAN:
+			return getColspan();
+		case XhtmlPackage.XHTML_TD_TYPE__HEADERS:
+			return getHeaders();
+		case XhtmlPackage.XHTML_TD_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_TD_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_TD_TYPE__ROWSPAN:
+			return getRowspan();
+		case XhtmlPackage.XHTML_TD_TYPE__SCOPE:
+			return getScope();
+		case XhtmlPackage.XHTML_TD_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_TD_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_TD_TYPE__TITLE:
+			return getTitle();
+		case XhtmlPackage.XHTML_TD_TYPE__VALIGN:
+			return getValign();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TD_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__XHTML_FLOW_MIX:
-				((FeatureMap.Internal)getXhtmlFlowMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__H1:
-				getH1().clear();
-				getH1().addAll((Collection<? extends XhtmlH1Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__H2:
-				getH2().clear();
-				getH2().addAll((Collection<? extends XhtmlH2Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__H3:
-				getH3().clear();
-				getH3().addAll((Collection<? extends XhtmlH3Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__H4:
-				getH4().clear();
-				getH4().addAll((Collection<? extends XhtmlH4Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__H5:
-				getH5().clear();
-				getH5().addAll((Collection<? extends XhtmlH5Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__H6:
-				getH6().clear();
-				getH6().addAll((Collection<? extends XhtmlH6Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__UL:
-				getUl().clear();
-				getUl().addAll((Collection<? extends XhtmlUlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__OL:
-				getOl().clear();
-				getOl().addAll((Collection<? extends XhtmlOlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__DL:
-				getDl().clear();
-				getDl().addAll((Collection<? extends XhtmlDlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__P:
-				getP().clear();
-				getP().addAll((Collection<? extends XhtmlPType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__DIV:
-				getDiv().clear();
-				getDiv().addAll((Collection<? extends XhtmlDivType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__PRE:
-				getPre().clear();
-				getPre().addAll((Collection<? extends XhtmlPreType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__BLOCKQUOTE:
-				getBlockquote().clear();
-				getBlockquote().addAll((Collection<? extends XhtmlBlockquoteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__ADDRESS:
-				getAddress().clear();
-				getAddress().addAll((Collection<? extends XhtmlAddressType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__HR:
-				getHr().clear();
-				getHr().addAll((Collection<? extends XhtmlHrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__TABLE:
-				getTable().clear();
-				getTable().addAll((Collection<? extends XhtmlTableType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__ABBR1:
-				setAbbr1((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__ALIGN:
-				setAlign((AlignType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__AXIS:
-				setAxis((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__CHAR:
-				setChar((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__CHAROFF:
-				setCharoff(newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__COLSPAN:
-				setColspan((BigInteger)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__HEADERS:
-				setHeaders((List<String>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__ROWSPAN:
-				setRowspan((BigInteger)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__SCOPE:
-				setScope((ScopeType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__VALIGN:
-				setValign((ValignType)newValue);
-				return;
+		case XhtmlPackage.XHTML_TD_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__XHTML_FLOW_MIX:
+			((FeatureMap.Internal) getXhtmlFlowMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__H1:
+			getH1().clear();
+			getH1().addAll((Collection<? extends XhtmlH1Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__H2:
+			getH2().clear();
+			getH2().addAll((Collection<? extends XhtmlH2Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__H3:
+			getH3().clear();
+			getH3().addAll((Collection<? extends XhtmlH3Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__H4:
+			getH4().clear();
+			getH4().addAll((Collection<? extends XhtmlH4Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__H5:
+			getH5().clear();
+			getH5().addAll((Collection<? extends XhtmlH5Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__H6:
+			getH6().clear();
+			getH6().addAll((Collection<? extends XhtmlH6Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__UL:
+			getUl().clear();
+			getUl().addAll((Collection<? extends XhtmlUlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__OL:
+			getOl().clear();
+			getOl().addAll((Collection<? extends XhtmlOlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__DL:
+			getDl().clear();
+			getDl().addAll((Collection<? extends XhtmlDlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__P:
+			getP().clear();
+			getP().addAll((Collection<? extends XhtmlPType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__DIV:
+			getDiv().clear();
+			getDiv().addAll((Collection<? extends XhtmlDivType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__PRE:
+			getPre().clear();
+			getPre().addAll((Collection<? extends XhtmlPreType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__BLOCKQUOTE:
+			getBlockquote().clear();
+			getBlockquote().addAll((Collection<? extends XhtmlBlockquoteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__ADDRESS:
+			getAddress().clear();
+			getAddress().addAll((Collection<? extends XhtmlAddressType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__HR:
+			getHr().clear();
+			getHr().addAll((Collection<? extends XhtmlHrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__TABLE:
+			getTable().clear();
+			getTable().addAll((Collection<? extends XhtmlTableType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__ABBR1:
+			setAbbr1((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__ALIGN:
+			setAlign((AlignType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__AXIS:
+			setAxis((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__CHAR:
+			setChar((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__CHAROFF:
+			setCharoff(newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__COLSPAN:
+			setColspan((BigInteger) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__HEADERS:
+			setHeaders((List<String>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__ROWSPAN:
+			setRowspan((BigInteger) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__SCOPE:
+			setScope((ScopeType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__VALIGN:
+			setValign((ValignType) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TD_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__XHTML_FLOW_MIX:
-				getXhtmlFlowMix().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__H1:
-				getH1().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__H2:
-				getH2().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__H3:
-				getH3().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__H4:
-				getH4().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__H5:
-				getH5().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__H6:
-				getH6().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__UL:
-				getUl().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__OL:
-				getOl().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__DL:
-				getDl().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__P:
-				getP().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__DIV:
-				getDiv().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__PRE:
-				getPre().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__BLOCKQUOTE:
-				getBlockquote().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__ADDRESS:
-				getAddress().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__HR:
-				getHr().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__TABLE:
-				getTable().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__ABBR1:
-				setAbbr1(ABBR1_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__ALIGN:
-				unsetAlign();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__AXIS:
-				setAxis(AXIS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__CHAR:
-				setChar(CHAR_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__CHAROFF:
-				setCharoff(CHAROFF_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__COLSPAN:
-				unsetColspan();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__HEADERS:
-				setHeaders(HEADERS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__ROWSPAN:
-				unsetRowspan();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__SCOPE:
-				unsetScope();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TD_TYPE__VALIGN:
-				unsetValign();
-				return;
+		case XhtmlPackage.XHTML_TD_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__XHTML_FLOW_MIX:
+			getXhtmlFlowMix().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__H1:
+			getH1().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__H2:
+			getH2().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__H3:
+			getH3().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__H4:
+			getH4().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__H5:
+			getH5().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__H6:
+			getH6().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__UL:
+			getUl().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__OL:
+			getOl().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__DL:
+			getDl().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__P:
+			getP().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__DIV:
+			getDiv().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__PRE:
+			getPre().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__BLOCKQUOTE:
+			getBlockquote().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__ADDRESS:
+			getAddress().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__HR:
+			getHr().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__TABLE:
+			getTable().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__ABBR1:
+			setAbbr1(ABBR1_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__ALIGN:
+			unsetAlign();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__AXIS:
+			setAxis(AXIS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__CHAR:
+			setChar(CHAR_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__CHAROFF:
+			setCharoff(CHAROFF_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__COLSPAN:
+			unsetColspan();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__HEADERS:
+			setHeaders(HEADERS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__ROWSPAN:
+			unsetRowspan();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__SCOPE:
+			unsetScope();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TD_TYPE__VALIGN:
+			unsetValign();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TD_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__XHTML_FLOW_MIX:
-				return !getXhtmlFlowMix().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__H1:
-				return !getH1().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__H2:
-				return !getH2().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__H3:
-				return !getH3().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__H4:
-				return !getH4().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__H5:
-				return !getH5().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__H6:
-				return !getH6().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__UL:
-				return !getUl().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__OL:
-				return !getOl().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__DL:
-				return !getDl().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__P:
-				return !getP().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__DIV:
-				return !getDiv().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__PRE:
-				return !getPre().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__BLOCKQUOTE:
-				return !getBlockquote().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__ADDRESS:
-				return !getAddress().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__HR:
-				return !getHr().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__TABLE:
-				return !getTable().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_TD_TYPE__ABBR1:
-				return ABBR1_EDEFAULT == null ? abbr1 != null : !ABBR1_EDEFAULT.equals(abbr1);
-			case XhtmlPackage.XHTML_TD_TYPE__ALIGN:
-				return isSetAlign();
-			case XhtmlPackage.XHTML_TD_TYPE__AXIS:
-				return AXIS_EDEFAULT == null ? axis != null : !AXIS_EDEFAULT.equals(axis);
-			case XhtmlPackage.XHTML_TD_TYPE__CHAR:
-				return CHAR_EDEFAULT == null ? char_ != null : !CHAR_EDEFAULT.equals(char_);
-			case XhtmlPackage.XHTML_TD_TYPE__CHAROFF:
-				return CHAROFF_EDEFAULT == null ? charoff != null : !CHAROFF_EDEFAULT.equals(charoff);
-			case XhtmlPackage.XHTML_TD_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_TD_TYPE__COLSPAN:
-				return isSetColspan();
-			case XhtmlPackage.XHTML_TD_TYPE__HEADERS:
-				return HEADERS_EDEFAULT == null ? headers != null : !HEADERS_EDEFAULT.equals(headers);
-			case XhtmlPackage.XHTML_TD_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_TD_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_TD_TYPE__ROWSPAN:
-				return isSetRowspan();
-			case XhtmlPackage.XHTML_TD_TYPE__SCOPE:
-				return isSetScope();
-			case XhtmlPackage.XHTML_TD_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_TD_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_TD_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-			case XhtmlPackage.XHTML_TD_TYPE__VALIGN:
-				return isSetValign();
+		case XhtmlPackage.XHTML_TD_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__XHTML_FLOW_MIX:
+			return !getXhtmlFlowMix().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__H1:
+			return !getH1().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__H2:
+			return !getH2().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__H3:
+			return !getH3().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__H4:
+			return !getH4().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__H5:
+			return !getH5().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__H6:
+			return !getH6().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__UL:
+			return !getUl().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__OL:
+			return !getOl().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__DL:
+			return !getDl().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__P:
+			return !getP().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__DIV:
+			return !getDiv().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__PRE:
+			return !getPre().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__BLOCKQUOTE:
+			return !getBlockquote().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__ADDRESS:
+			return !getAddress().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__HR:
+			return !getHr().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__TABLE:
+			return !getTable().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_TD_TYPE__ABBR1:
+			return ABBR1_EDEFAULT == null ? abbr1 != null : !ABBR1_EDEFAULT.equals(abbr1);
+		case XhtmlPackage.XHTML_TD_TYPE__ALIGN:
+			return isSetAlign();
+		case XhtmlPackage.XHTML_TD_TYPE__AXIS:
+			return AXIS_EDEFAULT == null ? axis != null : !AXIS_EDEFAULT.equals(axis);
+		case XhtmlPackage.XHTML_TD_TYPE__CHAR:
+			return CHAR_EDEFAULT == null ? char_ != null : !CHAR_EDEFAULT.equals(char_);
+		case XhtmlPackage.XHTML_TD_TYPE__CHAROFF:
+			return CHAROFF_EDEFAULT == null ? charoff != null : !CHAROFF_EDEFAULT.equals(charoff);
+		case XhtmlPackage.XHTML_TD_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_TD_TYPE__COLSPAN:
+			return isSetColspan();
+		case XhtmlPackage.XHTML_TD_TYPE__HEADERS:
+			return HEADERS_EDEFAULT == null ? headers != null : !HEADERS_EDEFAULT.equals(headers);
+		case XhtmlPackage.XHTML_TD_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_TD_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_TD_TYPE__ROWSPAN:
+			return isSetRowspan();
+		case XhtmlPackage.XHTML_TD_TYPE__SCOPE:
+			return isSetScope();
+		case XhtmlPackage.XHTML_TD_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_TD_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_TD_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_TD_TYPE__VALIGN:
+			return isSetValign();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy()) {
+			return super.toString();
+		}
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", abbr1: ");
+		result.append(", abbr1: "); //$NON-NLS-1$
 		result.append(abbr1);
-		result.append(", align: ");
-		if (alignESet) result.append(align); else result.append("<unset>");
-		result.append(", axis: ");
+		result.append(", align: "); //$NON-NLS-1$
+		if (alignESet) {
+			result.append(align);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", axis: "); //$NON-NLS-1$
 		result.append(axis);
-		result.append(", char: ");
+		result.append(", char: "); //$NON-NLS-1$
 		result.append(char_);
-		result.append(", charoff: ");
+		result.append(", charoff: "); //$NON-NLS-1$
 		result.append(charoff);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", colspan: ");
-		if (colspanESet) result.append(colspan); else result.append("<unset>");
-		result.append(", headers: ");
+		result.append(", colspan: "); //$NON-NLS-1$
+		if (colspanESet) {
+			result.append(colspan);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", headers: "); //$NON-NLS-1$
 		result.append(headers);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", rowspan: ");
-		if (rowspanESet) result.append(rowspan); else result.append("<unset>");
-		result.append(", scope: ");
-		if (scopeESet) result.append(scope); else result.append("<unset>");
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", rowspan: "); //$NON-NLS-1$
+		if (rowspanESet) {
+			result.append(rowspan);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", scope: "); //$NON-NLS-1$
+		if (scopeESet) {
+			result.append(scope);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet) {
+			result.append(space);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
-		result.append(", valign: ");
-		if (valignESet) result.append(valign); else result.append("<unset>");
+		result.append(", valign: "); //$NON-NLS-1$
+		if (valignESet) {
+			result.append(valign);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlTdTypeImpl
+} // XhtmlTdTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTfootTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTfootTypeImpl.java
index a744a8e..775ce1d 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTfootTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTfootTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,20 +15,14 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.AlignType;
 import org.eclipse.rmf.reqif10.xhtml.ValignType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
@@ -36,33 +30,31 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlTrType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tfoot Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Tfoot Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getTr <em>Tr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getAlign <em>Align</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getChar <em>Char</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getCharoff <em>Charoff</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getValign <em>Valign</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getTr <em>Tr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getAlign <em>Align</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getChar <em>Char</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getCharoff <em>Charoff</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTfootTypeImpl#getValign <em>Valign</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlTfootTypeImpl extends EObjectImpl implements XhtmlTfootType {
+public class XhtmlTfootTypeImpl extends MinimalEObjectImpl implements XhtmlTfootType {
 	/**
-	 * The cached value of the '{@link #getTr() <em>Tr</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTr() <em>Tr</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTr()
 	 * @generated
 	 * @ordered
@@ -70,9 +62,9 @@
 	protected EList<XhtmlTrType> tr;
 
 	/**
-	 * The default value of the '{@link #getAlign() <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAlign() <em>Align</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAlign()
 	 * @generated
 	 * @ordered
@@ -80,9 +72,9 @@
 	protected static final AlignType ALIGN_EDEFAULT = AlignType.LEFT;
 
 	/**
-	 * The cached value of the '{@link #getAlign() <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAlign() <em>Align</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getAlign()
 	 * @generated
 	 * @ordered
@@ -90,18 +82,17 @@
 	protected AlignType align = ALIGN_EDEFAULT;
 
 	/**
-	 * This is true if the Align attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Align attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean alignESet;
 
 	/**
-	 * The default value of the '{@link #getChar() <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getChar() <em>Char</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getChar()
 	 * @generated
 	 * @ordered
@@ -109,9 +100,9 @@
 	protected static final String CHAR_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getChar() <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getChar() <em>Char</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getChar()
 	 * @generated
 	 * @ordered
@@ -119,9 +110,9 @@
 	protected String char_ = CHAR_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCharoff() <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCharoff() <em>Charoff</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharoff()
 	 * @generated
 	 * @ordered
@@ -129,9 +120,9 @@
 	protected static final Object CHAROFF_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCharoff() <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCharoff() <em>Charoff</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharoff()
 	 * @generated
 	 * @ordered
@@ -139,9 +130,9 @@
 	protected Object charoff = CHAROFF_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -149,9 +140,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -159,9 +150,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -169,9 +159,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -179,9 +168,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -189,9 +178,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -199,9 +188,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -209,9 +198,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -219,18 +208,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -238,9 +226,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -248,9 +236,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -258,9 +246,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -268,9 +256,9 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getValign() <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValign() <em>Valign</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValign()
 	 * @generated
 	 * @ordered
@@ -278,9 +266,9 @@
 	protected static final ValignType VALIGN_EDEFAULT = ValignType.TOP;
 
 	/**
-	 * The cached value of the '{@link #getValign() <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getValign() <em>Valign</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValign()
 	 * @generated
 	 * @ordered
@@ -288,17 +276,16 @@
 	protected ValignType valign = VALIGN_EDEFAULT;
 
 	/**
-	 * This is true if the Valign attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Valign attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean valignESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlTfootTypeImpl() {
@@ -306,8 +293,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -316,8 +303,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlTrType> getTr() {
@@ -328,8 +315,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AlignType getAlign() {
@@ -337,8 +324,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAlign(AlignType newAlign) {
@@ -351,8 +338,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetAlign() {
@@ -365,8 +352,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetAlign() {
@@ -374,8 +361,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getChar() {
@@ -383,8 +370,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setChar(String newChar) {
@@ -395,8 +382,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getCharoff() {
@@ -404,8 +391,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCharoff(Object newCharoff) {
@@ -416,8 +403,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -425,8 +412,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -437,8 +424,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -446,8 +433,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -458,8 +445,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -467,8 +454,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -479,8 +466,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -488,8 +475,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -502,8 +489,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -516,8 +503,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -525,8 +512,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -534,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -546,8 +533,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -555,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -567,8 +554,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ValignType getValign() {
@@ -576,8 +563,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValign(ValignType newValign) {
@@ -590,8 +577,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetValign() {
@@ -604,8 +591,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetValign() {
@@ -613,211 +600,221 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TFOOT_TYPE__TR:
-				return ((InternalEList<?>)getTr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TFOOT_TYPE__TR:
+			return ((InternalEList<?>) getTr()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TFOOT_TYPE__TR:
-				return getTr();
-			case XhtmlPackage.XHTML_TFOOT_TYPE__ALIGN:
-				return getAlign();
-			case XhtmlPackage.XHTML_TFOOT_TYPE__CHAR:
-				return getChar();
-			case XhtmlPackage.XHTML_TFOOT_TYPE__CHAROFF:
-				return getCharoff();
-			case XhtmlPackage.XHTML_TFOOT_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_TFOOT_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_TFOOT_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_TFOOT_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_TFOOT_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_TFOOT_TYPE__TITLE:
-				return getTitle();
-			case XhtmlPackage.XHTML_TFOOT_TYPE__VALIGN:
-				return getValign();
+		case XhtmlPackage.XHTML_TFOOT_TYPE__TR:
+			return getTr();
+		case XhtmlPackage.XHTML_TFOOT_TYPE__ALIGN:
+			return getAlign();
+		case XhtmlPackage.XHTML_TFOOT_TYPE__CHAR:
+			return getChar();
+		case XhtmlPackage.XHTML_TFOOT_TYPE__CHAROFF:
+			return getCharoff();
+		case XhtmlPackage.XHTML_TFOOT_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_TFOOT_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_TFOOT_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_TFOOT_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_TFOOT_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_TFOOT_TYPE__TITLE:
+			return getTitle();
+		case XhtmlPackage.XHTML_TFOOT_TYPE__VALIGN:
+			return getValign();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TFOOT_TYPE__TR:
-				getTr().clear();
-				getTr().addAll((Collection<? extends XhtmlTrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__ALIGN:
-				setAlign((AlignType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__CHAR:
-				setChar((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__CHAROFF:
-				setCharoff(newValue);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__VALIGN:
-				setValign((ValignType)newValue);
-				return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__TR:
+			getTr().clear();
+			getTr().addAll((Collection<? extends XhtmlTrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__ALIGN:
+			setAlign((AlignType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__CHAR:
+			setChar((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__CHAROFF:
+			setCharoff(newValue);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__VALIGN:
+			setValign((ValignType) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TFOOT_TYPE__TR:
-				getTr().clear();
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__ALIGN:
-				unsetAlign();
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__CHAR:
-				setChar(CHAR_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__CHAROFF:
-				setCharoff(CHAROFF_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TFOOT_TYPE__VALIGN:
-				unsetValign();
-				return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__TR:
+			getTr().clear();
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__ALIGN:
+			unsetAlign();
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__CHAR:
+			setChar(CHAR_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__CHAROFF:
+			setCharoff(CHAROFF_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TFOOT_TYPE__VALIGN:
+			unsetValign();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TFOOT_TYPE__TR:
-				return tr != null && !tr.isEmpty();
-			case XhtmlPackage.XHTML_TFOOT_TYPE__ALIGN:
-				return isSetAlign();
-			case XhtmlPackage.XHTML_TFOOT_TYPE__CHAR:
-				return CHAR_EDEFAULT == null ? char_ != null : !CHAR_EDEFAULT.equals(char_);
-			case XhtmlPackage.XHTML_TFOOT_TYPE__CHAROFF:
-				return CHAROFF_EDEFAULT == null ? charoff != null : !CHAROFF_EDEFAULT.equals(charoff);
-			case XhtmlPackage.XHTML_TFOOT_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_TFOOT_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_TFOOT_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_TFOOT_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_TFOOT_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_TFOOT_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-			case XhtmlPackage.XHTML_TFOOT_TYPE__VALIGN:
-				return isSetValign();
+		case XhtmlPackage.XHTML_TFOOT_TYPE__TR:
+			return tr != null && !tr.isEmpty();
+		case XhtmlPackage.XHTML_TFOOT_TYPE__ALIGN:
+			return isSetAlign();
+		case XhtmlPackage.XHTML_TFOOT_TYPE__CHAR:
+			return CHAR_EDEFAULT == null ? char_ != null : !CHAR_EDEFAULT.equals(char_);
+		case XhtmlPackage.XHTML_TFOOT_TYPE__CHAROFF:
+			return CHAROFF_EDEFAULT == null ? charoff != null : !CHAROFF_EDEFAULT.equals(charoff);
+		case XhtmlPackage.XHTML_TFOOT_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_TFOOT_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_TFOOT_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_TFOOT_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_TFOOT_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_TFOOT_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_TFOOT_TYPE__VALIGN:
+			return isSetValign();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (align: ");
-		if (alignESet) result.append(align); else result.append("<unset>");
-		result.append(", char: ");
+		result.append(" (align: "); //$NON-NLS-1$
+		if (alignESet)
+			result.append(align);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", char: "); //$NON-NLS-1$
 		result.append(char_);
-		result.append(", charoff: ");
+		result.append(", charoff: "); //$NON-NLS-1$
 		result.append(charoff);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
-		result.append(", valign: ");
-		if (valignESet) result.append(valign); else result.append("<unset>");
+		result.append(", valign: "); //$NON-NLS-1$
+		if (valignESet)
+			result.append(valign);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlTfootTypeImpl
+} // XhtmlTfootTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlThTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlThTypeImpl.java
index 7ef4176..dee2fdf 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlThTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlThTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,27 +12,20 @@
 package org.eclipse.rmf.reqif10.xhtml.impl;
 
 import java.math.BigInteger;
-
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.AlignType;
 import org.eclipse.rmf.reqif10.xhtml.ScopeType;
 import org.eclipse.rmf.reqif10.xhtml.ValignType;
@@ -73,80 +66,78 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Th Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Th Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getH1 <em>H1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getH2 <em>H2</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getH3 <em>H3</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getH4 <em>H4</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getH5 <em>H5</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getH6 <em>H6</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getUl <em>Ul</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getOl <em>Ol</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getDl <em>Dl</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getP <em>P</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getDiv <em>Div</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getPre <em>Pre</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getBlockquote <em>Blockquote</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getHr <em>Hr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getAbbr1 <em>Abbr1</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getAlign <em>Align</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getAxis <em>Axis</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getChar <em>Char</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getCharoff <em>Charoff</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getColspan <em>Colspan</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getHeaders <em>Headers</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getRowspan <em>Rowspan</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getScope <em>Scope</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getValign <em>Valign</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getXhtmlFlowMix <em>Xhtml Flow Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getH1 <em>H1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getH2 <em>H2</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getH3 <em>H3</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getH4 <em>H4</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getH5 <em>H5</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getH6 <em>H6</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getUl <em>Ul</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getOl <em>Ol</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getDl <em>Dl</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getP <em>P</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getDiv <em>Div</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getPre <em>Pre</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getBlockquote <em>Blockquote</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getAddress <em>Address</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getHr <em>Hr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getAbbr1 <em>Abbr1</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getAlign <em>Align</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getAxis <em>Axis</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getChar <em>Char</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getCharoff <em>Charoff</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getColspan <em>Colspan</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getHeaders <em>Headers</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getRowspan <em>Rowspan</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getScope <em>Scope</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlThTypeImpl#getValign <em>Valign</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlThTypeImpl extends EObjectImpl implements XhtmlThType {
+public class XhtmlThTypeImpl extends MinimalEObjectImpl implements XhtmlThType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -154,9 +145,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getAbbr1() <em>Abbr1</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAbbr1() <em>Abbr1</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAbbr1()
 	 * @generated
 	 * @ordered
@@ -164,9 +155,9 @@
 	protected static final String ABBR1_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getAbbr1() <em>Abbr1</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAbbr1() <em>Abbr1</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getAbbr1()
 	 * @generated
 	 * @ordered
@@ -174,9 +165,9 @@
 	protected String abbr1 = ABBR1_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getAlign() <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAlign() <em>Align</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAlign()
 	 * @generated
 	 * @ordered
@@ -184,9 +175,9 @@
 	protected static final AlignType ALIGN_EDEFAULT = AlignType.LEFT;
 
 	/**
-	 * The cached value of the '{@link #getAlign() <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAlign() <em>Align</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getAlign()
 	 * @generated
 	 * @ordered
@@ -194,18 +185,17 @@
 	protected AlignType align = ALIGN_EDEFAULT;
 
 	/**
-	 * This is true if the Align attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Align attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean alignESet;
 
 	/**
-	 * The default value of the '{@link #getAxis() <em>Axis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAxis() <em>Axis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getAxis()
 	 * @generated
 	 * @ordered
@@ -213,9 +203,9 @@
 	protected static final String AXIS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getAxis() <em>Axis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAxis() <em>Axis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getAxis()
 	 * @generated
 	 * @ordered
@@ -223,9 +213,9 @@
 	protected String axis = AXIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getChar() <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getChar() <em>Char</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getChar()
 	 * @generated
 	 * @ordered
@@ -233,9 +223,9 @@
 	protected static final String CHAR_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getChar() <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getChar() <em>Char</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getChar()
 	 * @generated
 	 * @ordered
@@ -243,9 +233,9 @@
 	protected String char_ = CHAR_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCharoff() <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCharoff() <em>Charoff</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharoff()
 	 * @generated
 	 * @ordered
@@ -253,9 +243,9 @@
 	protected static final Object CHAROFF_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCharoff() <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCharoff() <em>Charoff</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharoff()
 	 * @generated
 	 * @ordered
@@ -263,9 +253,9 @@
 	protected Object charoff = CHAROFF_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -273,9 +263,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -283,19 +273,19 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getColspan() <em>Colspan</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getColspan() <em>Colspan</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getColspan()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final BigInteger COLSPAN_EDEFAULT = new BigInteger("1");
+	protected static final BigInteger COLSPAN_EDEFAULT = new BigInteger("1"); //$NON-NLS-1$
 
 	/**
-	 * The cached value of the '{@link #getColspan() <em>Colspan</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getColspan() <em>Colspan</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getColspan()
 	 * @generated
 	 * @ordered
@@ -303,18 +293,17 @@
 	protected BigInteger colspan = COLSPAN_EDEFAULT;
 
 	/**
-	 * This is true if the Colspan attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Colspan attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean colspanESet;
 
 	/**
-	 * The default value of the '{@link #getHeaders() <em>Headers</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getHeaders() <em>Headers</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getHeaders()
 	 * @generated
 	 * @ordered
@@ -322,9 +311,9 @@
 	protected static final List<String> HEADERS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getHeaders() <em>Headers</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHeaders() <em>Headers</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getHeaders()
 	 * @generated
 	 * @ordered
@@ -332,9 +321,8 @@
 	protected List<String> headers = HEADERS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -342,9 +330,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -352,9 +339,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -362,9 +349,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -372,19 +359,19 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getRowspan() <em>Rowspan</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getRowspan() <em>Rowspan</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getRowspan()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final BigInteger ROWSPAN_EDEFAULT = new BigInteger("1");
+	protected static final BigInteger ROWSPAN_EDEFAULT = new BigInteger("1"); //$NON-NLS-1$
 
 	/**
-	 * The cached value of the '{@link #getRowspan() <em>Rowspan</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getRowspan() <em>Rowspan</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getRowspan()
 	 * @generated
 	 * @ordered
@@ -392,18 +379,17 @@
 	protected BigInteger rowspan = ROWSPAN_EDEFAULT;
 
 	/**
-	 * This is true if the Rowspan attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Rowspan attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean rowspanESet;
 
 	/**
-	 * The default value of the '{@link #getScope() <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getScope() <em>Scope</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getScope()
 	 * @generated
 	 * @ordered
@@ -411,9 +397,9 @@
 	protected static final ScopeType SCOPE_EDEFAULT = ScopeType.ROW;
 
 	/**
-	 * The cached value of the '{@link #getScope() <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getScope() <em>Scope</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getScope()
 	 * @generated
 	 * @ordered
@@ -421,18 +407,17 @@
 	protected ScopeType scope = SCOPE_EDEFAULT;
 
 	/**
-	 * This is true if the Scope attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Scope attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean scopeESet;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -440,9 +425,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -450,18 +435,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -469,9 +453,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -479,9 +463,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -489,9 +473,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -499,9 +483,9 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getValign() <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValign() <em>Valign</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValign()
 	 * @generated
 	 * @ordered
@@ -509,9 +493,9 @@
 	protected static final ValignType VALIGN_EDEFAULT = ValignType.TOP;
 
 	/**
-	 * The cached value of the '{@link #getValign() <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getValign() <em>Valign</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValign()
 	 * @generated
 	 * @ordered
@@ -519,17 +503,16 @@
 	protected ValignType valign = VALIGN_EDEFAULT;
 
 	/**
-	 * This is true if the Valign attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Valign attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean valignESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlThTypeImpl() {
@@ -537,8 +520,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -547,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -559,17 +542,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlFlowMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlThType_XhtmlFlowMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlThType_XhtmlFlowMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH1Type> getH1() {
@@ -577,8 +560,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH2Type> getH2() {
@@ -586,8 +569,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH3Type> getH3() {
@@ -595,8 +578,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH4Type> getH4() {
@@ -604,8 +587,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH5Type> getH5() {
@@ -613,8 +596,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlH6Type> getH6() {
@@ -622,8 +605,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlUlType> getUl() {
@@ -631,8 +614,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlOlType> getOl() {
@@ -640,8 +623,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDlType> getDl() {
@@ -649,8 +632,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlPType> getP() {
@@ -658,8 +641,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDivType> getDiv() {
@@ -667,8 +650,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlPreType> getPre() {
@@ -676,8 +659,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBlockquoteType> getBlockquote() {
@@ -685,8 +668,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAddressType> getAddress() {
@@ -694,8 +677,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlHrType> getHr() {
@@ -703,8 +686,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlTableType> getTable() {
@@ -712,8 +695,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -721,8 +704,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -730,8 +713,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -739,8 +722,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -748,8 +731,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -757,8 +740,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -766,8 +749,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -775,8 +758,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -784,8 +767,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -793,8 +776,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -802,8 +785,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -811,8 +794,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -820,8 +803,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -829,8 +812,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -838,8 +821,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -847,8 +830,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -856,8 +839,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -865,8 +848,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -874,8 +857,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -883,8 +866,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -892,8 +875,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -901,8 +884,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -910,8 +893,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -919,8 +902,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -928,8 +911,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getAbbr1() {
@@ -937,20 +920,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAbbr1(String newAbbr1) {
 		String oldAbbr1 = abbr1;
 		abbr1 = newAbbr1;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TH_TYPE__ABBR1, oldAbbr1, abbr1));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AlignType getAlign() {
@@ -958,8 +942,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAlign(AlignType newAlign) {
@@ -967,13 +951,14 @@
 		align = newAlign == null ? ALIGN_EDEFAULT : newAlign;
 		boolean oldAlignESet = alignESet;
 		alignESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TH_TYPE__ALIGN, oldAlign, align, !oldAlignESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetAlign() {
@@ -981,13 +966,14 @@
 		boolean oldAlignESet = alignESet;
 		align = ALIGN_EDEFAULT;
 		alignESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_TH_TYPE__ALIGN, oldAlign, ALIGN_EDEFAULT, oldAlignESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetAlign() {
@@ -995,8 +981,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getAxis() {
@@ -1004,20 +990,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAxis(String newAxis) {
 		String oldAxis = axis;
 		axis = newAxis;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TH_TYPE__AXIS, oldAxis, axis));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getChar() {
@@ -1025,20 +1012,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setChar(String newChar) {
 		String oldChar = char_;
 		char_ = newChar;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TH_TYPE__CHAR, oldChar, char_));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getCharoff() {
@@ -1046,20 +1034,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCharoff(Object newCharoff) {
 		Object oldCharoff = charoff;
 		charoff = newCharoff;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TH_TYPE__CHAROFF, oldCharoff, charoff));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -1067,20 +1056,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
 		String oldClass = class_;
 		class_ = newClass;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TH_TYPE__CLASS, oldClass, class_));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger getColspan() {
@@ -1088,8 +1078,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setColspan(BigInteger newColspan) {
@@ -1097,13 +1087,14 @@
 		colspan = newColspan;
 		boolean oldColspanESet = colspanESet;
 		colspanESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TH_TYPE__COLSPAN, oldColspan, colspan, !oldColspanESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetColspan() {
@@ -1111,13 +1102,14 @@
 		boolean oldColspanESet = colspanESet;
 		colspan = COLSPAN_EDEFAULT;
 		colspanESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_TH_TYPE__COLSPAN, oldColspan, COLSPAN_EDEFAULT, oldColspanESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetColspan() {
@@ -1125,8 +1117,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public List<String> getHeaders() {
@@ -1134,20 +1126,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHeaders(List<String> newHeaders) {
 		List<String> oldHeaders = headers;
 		headers = newHeaders;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TH_TYPE__HEADERS, oldHeaders, headers));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -1155,20 +1148,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
 		String oldId = id;
 		id = newId;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TH_TYPE__ID, oldId, id));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -1176,20 +1170,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
 		String oldLang = lang;
 		lang = newLang;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TH_TYPE__LANG, oldLang, lang));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger getRowspan() {
@@ -1197,8 +1192,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRowspan(BigInteger newRowspan) {
@@ -1206,13 +1201,14 @@
 		rowspan = newRowspan;
 		boolean oldRowspanESet = rowspanESet;
 		rowspanESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TH_TYPE__ROWSPAN, oldRowspan, rowspan, !oldRowspanESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetRowspan() {
@@ -1220,13 +1216,14 @@
 		boolean oldRowspanESet = rowspanESet;
 		rowspan = ROWSPAN_EDEFAULT;
 		rowspanESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_TH_TYPE__ROWSPAN, oldRowspan, ROWSPAN_EDEFAULT, oldRowspanESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetRowspan() {
@@ -1234,8 +1231,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ScopeType getScope() {
@@ -1243,8 +1240,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setScope(ScopeType newScope) {
@@ -1252,13 +1249,14 @@
 		scope = newScope == null ? SCOPE_EDEFAULT : newScope;
 		boolean oldScopeESet = scopeESet;
 		scopeESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TH_TYPE__SCOPE, oldScope, scope, !oldScopeESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetScope() {
@@ -1266,13 +1264,14 @@
 		boolean oldScopeESet = scopeESet;
 		scope = SCOPE_EDEFAULT;
 		scopeESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_TH_TYPE__SCOPE, oldScope, SCOPE_EDEFAULT, oldScopeESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetScope() {
@@ -1280,8 +1279,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -1289,8 +1288,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -1298,13 +1297,14 @@
 		space = newSpace == null ? SPACE_EDEFAULT : newSpace;
 		boolean oldSpaceESet = spaceESet;
 		spaceESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TH_TYPE__SPACE, oldSpace, space, !oldSpaceESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -1312,13 +1312,14 @@
 		boolean oldSpaceESet = spaceESet;
 		space = SPACE_EDEFAULT;
 		spaceESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_TH_TYPE__SPACE, oldSpace, SPACE_EDEFAULT, oldSpaceESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -1326,8 +1327,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -1335,20 +1336,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
 		String oldStyle = style;
 		style = newStyle;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TH_TYPE__STYLE, oldStyle, style));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -1356,20 +1358,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
 		String oldTitle = title;
 		title = newTitle;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TH_TYPE__TITLE, oldTitle, title));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ValignType getValign() {
@@ -1377,8 +1380,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValign(ValignType newValign) {
@@ -1386,13 +1389,14 @@
 		valign = newValign == null ? VALIGN_EDEFAULT : newValign;
 		boolean oldValignESet = valignESet;
 		valignESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, XhtmlPackage.XHTML_TH_TYPE__VALIGN, oldValign, valign, !oldValignESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetValign() {
@@ -1400,13 +1404,14 @@
 		boolean oldValignESet = valignESet;
 		valign = VALIGN_EDEFAULT;
 		valignESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, XhtmlPackage.XHTML_TH_TYPE__VALIGN, oldValign, VALIGN_EDEFAULT, oldValignESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetValign() {
@@ -1414,818 +1419,848 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TH_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__XHTML_FLOW_MIX:
-				return ((InternalEList<?>)getXhtmlFlowMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__H1:
-				return ((InternalEList<?>)getH1()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__H2:
-				return ((InternalEList<?>)getH2()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__H3:
-				return ((InternalEList<?>)getH3()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__H4:
-				return ((InternalEList<?>)getH4()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__H5:
-				return ((InternalEList<?>)getH5()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__H6:
-				return ((InternalEList<?>)getH6()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__UL:
-				return ((InternalEList<?>)getUl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__OL:
-				return ((InternalEList<?>)getOl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__DL:
-				return ((InternalEList<?>)getDl()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__P:
-				return ((InternalEList<?>)getP()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__DIV:
-				return ((InternalEList<?>)getDiv()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__PRE:
-				return ((InternalEList<?>)getPre()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__BLOCKQUOTE:
-				return ((InternalEList<?>)getBlockquote()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__ADDRESS:
-				return ((InternalEList<?>)getAddress()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__HR:
-				return ((InternalEList<?>)getHr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__TABLE:
-				return ((InternalEList<?>)getTable()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TH_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__XHTML_FLOW_MIX:
+			return ((InternalEList<?>) getXhtmlFlowMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__H1:
+			return ((InternalEList<?>) getH1()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__H2:
+			return ((InternalEList<?>) getH2()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__H3:
+			return ((InternalEList<?>) getH3()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__H4:
+			return ((InternalEList<?>) getH4()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__H5:
+			return ((InternalEList<?>) getH5()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__H6:
+			return ((InternalEList<?>) getH6()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__UL:
+			return ((InternalEList<?>) getUl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__OL:
+			return ((InternalEList<?>) getOl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__DL:
+			return ((InternalEList<?>) getDl()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__P:
+			return ((InternalEList<?>) getP()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__DIV:
+			return ((InternalEList<?>) getDiv()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__PRE:
+			return ((InternalEList<?>) getPre()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__BLOCKQUOTE:
+			return ((InternalEList<?>) getBlockquote()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__ADDRESS:
+			return ((InternalEList<?>) getAddress()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__HR:
+			return ((InternalEList<?>) getHr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__TABLE:
+			return ((InternalEList<?>) getTable()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TH_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TH_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_TH_TYPE__XHTML_FLOW_MIX:
-				if (coreType) return getXhtmlFlowMix();
-				return ((FeatureMap.Internal)getXhtmlFlowMix()).getWrapper();
-			case XhtmlPackage.XHTML_TH_TYPE__H1:
-				return getH1();
-			case XhtmlPackage.XHTML_TH_TYPE__H2:
-				return getH2();
-			case XhtmlPackage.XHTML_TH_TYPE__H3:
-				return getH3();
-			case XhtmlPackage.XHTML_TH_TYPE__H4:
-				return getH4();
-			case XhtmlPackage.XHTML_TH_TYPE__H5:
-				return getH5();
-			case XhtmlPackage.XHTML_TH_TYPE__H6:
-				return getH6();
-			case XhtmlPackage.XHTML_TH_TYPE__UL:
-				return getUl();
-			case XhtmlPackage.XHTML_TH_TYPE__OL:
-				return getOl();
-			case XhtmlPackage.XHTML_TH_TYPE__DL:
-				return getDl();
-			case XhtmlPackage.XHTML_TH_TYPE__P:
-				return getP();
-			case XhtmlPackage.XHTML_TH_TYPE__DIV:
-				return getDiv();
-			case XhtmlPackage.XHTML_TH_TYPE__PRE:
-				return getPre();
-			case XhtmlPackage.XHTML_TH_TYPE__BLOCKQUOTE:
-				return getBlockquote();
-			case XhtmlPackage.XHTML_TH_TYPE__ADDRESS:
-				return getAddress();
-			case XhtmlPackage.XHTML_TH_TYPE__HR:
-				return getHr();
-			case XhtmlPackage.XHTML_TH_TYPE__TABLE:
-				return getTable();
-			case XhtmlPackage.XHTML_TH_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_TH_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_TH_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_TH_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_TH_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_TH_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_TH_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_TH_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_TH_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_TH_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_TH_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_TH_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_TH_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_TH_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_TH_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_TH_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_TH_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_TH_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_TH_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_TH_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_TH_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_TH_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_TH_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_TH_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_TH_TYPE__ABBR1:
-				return getAbbr1();
-			case XhtmlPackage.XHTML_TH_TYPE__ALIGN:
-				return getAlign();
-			case XhtmlPackage.XHTML_TH_TYPE__AXIS:
-				return getAxis();
-			case XhtmlPackage.XHTML_TH_TYPE__CHAR:
-				return getChar();
-			case XhtmlPackage.XHTML_TH_TYPE__CHAROFF:
-				return getCharoff();
-			case XhtmlPackage.XHTML_TH_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_TH_TYPE__COLSPAN:
-				return getColspan();
-			case XhtmlPackage.XHTML_TH_TYPE__HEADERS:
-				return getHeaders();
-			case XhtmlPackage.XHTML_TH_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_TH_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_TH_TYPE__ROWSPAN:
-				return getRowspan();
-			case XhtmlPackage.XHTML_TH_TYPE__SCOPE:
-				return getScope();
-			case XhtmlPackage.XHTML_TH_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_TH_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_TH_TYPE__TITLE:
-				return getTitle();
-			case XhtmlPackage.XHTML_TH_TYPE__VALIGN:
-				return getValign();
+		case XhtmlPackage.XHTML_TH_TYPE__MIXED:
+			if (coreType) {
+				return getMixed();
+			}
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_TH_TYPE__XHTML_FLOW_MIX:
+			if (coreType) {
+				return getXhtmlFlowMix();
+			}
+			return ((FeatureMap.Internal) getXhtmlFlowMix()).getWrapper();
+		case XhtmlPackage.XHTML_TH_TYPE__H1:
+			return getH1();
+		case XhtmlPackage.XHTML_TH_TYPE__H2:
+			return getH2();
+		case XhtmlPackage.XHTML_TH_TYPE__H3:
+			return getH3();
+		case XhtmlPackage.XHTML_TH_TYPE__H4:
+			return getH4();
+		case XhtmlPackage.XHTML_TH_TYPE__H5:
+			return getH5();
+		case XhtmlPackage.XHTML_TH_TYPE__H6:
+			return getH6();
+		case XhtmlPackage.XHTML_TH_TYPE__UL:
+			return getUl();
+		case XhtmlPackage.XHTML_TH_TYPE__OL:
+			return getOl();
+		case XhtmlPackage.XHTML_TH_TYPE__DL:
+			return getDl();
+		case XhtmlPackage.XHTML_TH_TYPE__P:
+			return getP();
+		case XhtmlPackage.XHTML_TH_TYPE__DIV:
+			return getDiv();
+		case XhtmlPackage.XHTML_TH_TYPE__PRE:
+			return getPre();
+		case XhtmlPackage.XHTML_TH_TYPE__BLOCKQUOTE:
+			return getBlockquote();
+		case XhtmlPackage.XHTML_TH_TYPE__ADDRESS:
+			return getAddress();
+		case XhtmlPackage.XHTML_TH_TYPE__HR:
+			return getHr();
+		case XhtmlPackage.XHTML_TH_TYPE__TABLE:
+			return getTable();
+		case XhtmlPackage.XHTML_TH_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_TH_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_TH_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_TH_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_TH_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_TH_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_TH_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_TH_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_TH_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_TH_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_TH_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_TH_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_TH_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_TH_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_TH_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_TH_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_TH_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_TH_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_TH_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_TH_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_TH_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_TH_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_TH_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_TH_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_TH_TYPE__ABBR1:
+			return getAbbr1();
+		case XhtmlPackage.XHTML_TH_TYPE__ALIGN:
+			return getAlign();
+		case XhtmlPackage.XHTML_TH_TYPE__AXIS:
+			return getAxis();
+		case XhtmlPackage.XHTML_TH_TYPE__CHAR:
+			return getChar();
+		case XhtmlPackage.XHTML_TH_TYPE__CHAROFF:
+			return getCharoff();
+		case XhtmlPackage.XHTML_TH_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_TH_TYPE__COLSPAN:
+			return getColspan();
+		case XhtmlPackage.XHTML_TH_TYPE__HEADERS:
+			return getHeaders();
+		case XhtmlPackage.XHTML_TH_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_TH_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_TH_TYPE__ROWSPAN:
+			return getRowspan();
+		case XhtmlPackage.XHTML_TH_TYPE__SCOPE:
+			return getScope();
+		case XhtmlPackage.XHTML_TH_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_TH_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_TH_TYPE__TITLE:
+			return getTitle();
+		case XhtmlPackage.XHTML_TH_TYPE__VALIGN:
+			return getValign();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TH_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__XHTML_FLOW_MIX:
-				((FeatureMap.Internal)getXhtmlFlowMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__H1:
-				getH1().clear();
-				getH1().addAll((Collection<? extends XhtmlH1Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__H2:
-				getH2().clear();
-				getH2().addAll((Collection<? extends XhtmlH2Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__H3:
-				getH3().clear();
-				getH3().addAll((Collection<? extends XhtmlH3Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__H4:
-				getH4().clear();
-				getH4().addAll((Collection<? extends XhtmlH4Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__H5:
-				getH5().clear();
-				getH5().addAll((Collection<? extends XhtmlH5Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__H6:
-				getH6().clear();
-				getH6().addAll((Collection<? extends XhtmlH6Type>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__UL:
-				getUl().clear();
-				getUl().addAll((Collection<? extends XhtmlUlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__OL:
-				getOl().clear();
-				getOl().addAll((Collection<? extends XhtmlOlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__DL:
-				getDl().clear();
-				getDl().addAll((Collection<? extends XhtmlDlType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__P:
-				getP().clear();
-				getP().addAll((Collection<? extends XhtmlPType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__DIV:
-				getDiv().clear();
-				getDiv().addAll((Collection<? extends XhtmlDivType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__PRE:
-				getPre().clear();
-				getPre().addAll((Collection<? extends XhtmlPreType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__BLOCKQUOTE:
-				getBlockquote().clear();
-				getBlockquote().addAll((Collection<? extends XhtmlBlockquoteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__ADDRESS:
-				getAddress().clear();
-				getAddress().addAll((Collection<? extends XhtmlAddressType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__HR:
-				getHr().clear();
-				getHr().addAll((Collection<? extends XhtmlHrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__TABLE:
-				getTable().clear();
-				getTable().addAll((Collection<? extends XhtmlTableType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__ABBR1:
-				setAbbr1((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__ALIGN:
-				setAlign((AlignType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__AXIS:
-				setAxis((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__CHAR:
-				setChar((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__CHAROFF:
-				setCharoff(newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__COLSPAN:
-				setColspan((BigInteger)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__HEADERS:
-				setHeaders((List<String>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__ROWSPAN:
-				setRowspan((BigInteger)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__SCOPE:
-				setScope((ScopeType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__VALIGN:
-				setValign((ValignType)newValue);
-				return;
+		case XhtmlPackage.XHTML_TH_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__XHTML_FLOW_MIX:
+			((FeatureMap.Internal) getXhtmlFlowMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__H1:
+			getH1().clear();
+			getH1().addAll((Collection<? extends XhtmlH1Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__H2:
+			getH2().clear();
+			getH2().addAll((Collection<? extends XhtmlH2Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__H3:
+			getH3().clear();
+			getH3().addAll((Collection<? extends XhtmlH3Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__H4:
+			getH4().clear();
+			getH4().addAll((Collection<? extends XhtmlH4Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__H5:
+			getH5().clear();
+			getH5().addAll((Collection<? extends XhtmlH5Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__H6:
+			getH6().clear();
+			getH6().addAll((Collection<? extends XhtmlH6Type>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__UL:
+			getUl().clear();
+			getUl().addAll((Collection<? extends XhtmlUlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__OL:
+			getOl().clear();
+			getOl().addAll((Collection<? extends XhtmlOlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__DL:
+			getDl().clear();
+			getDl().addAll((Collection<? extends XhtmlDlType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__P:
+			getP().clear();
+			getP().addAll((Collection<? extends XhtmlPType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__DIV:
+			getDiv().clear();
+			getDiv().addAll((Collection<? extends XhtmlDivType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__PRE:
+			getPre().clear();
+			getPre().addAll((Collection<? extends XhtmlPreType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__BLOCKQUOTE:
+			getBlockquote().clear();
+			getBlockquote().addAll((Collection<? extends XhtmlBlockquoteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__ADDRESS:
+			getAddress().clear();
+			getAddress().addAll((Collection<? extends XhtmlAddressType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__HR:
+			getHr().clear();
+			getHr().addAll((Collection<? extends XhtmlHrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__TABLE:
+			getTable().clear();
+			getTable().addAll((Collection<? extends XhtmlTableType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__ABBR1:
+			setAbbr1((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__ALIGN:
+			setAlign((AlignType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__AXIS:
+			setAxis((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__CHAR:
+			setChar((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__CHAROFF:
+			setCharoff(newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__COLSPAN:
+			setColspan((BigInteger) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__HEADERS:
+			setHeaders((List<String>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__ROWSPAN:
+			setRowspan((BigInteger) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__SCOPE:
+			setScope((ScopeType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__VALIGN:
+			setValign((ValignType) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TH_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__XHTML_FLOW_MIX:
-				getXhtmlFlowMix().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__H1:
-				getH1().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__H2:
-				getH2().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__H3:
-				getH3().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__H4:
-				getH4().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__H5:
-				getH5().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__H6:
-				getH6().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__UL:
-				getUl().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__OL:
-				getOl().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__DL:
-				getDl().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__P:
-				getP().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__DIV:
-				getDiv().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__PRE:
-				getPre().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__BLOCKQUOTE:
-				getBlockquote().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__ADDRESS:
-				getAddress().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__HR:
-				getHr().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__TABLE:
-				getTable().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__ABBR1:
-				setAbbr1(ABBR1_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__ALIGN:
-				unsetAlign();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__AXIS:
-				setAxis(AXIS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__CHAR:
-				setChar(CHAR_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__CHAROFF:
-				setCharoff(CHAROFF_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__COLSPAN:
-				unsetColspan();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__HEADERS:
-				setHeaders(HEADERS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__ROWSPAN:
-				unsetRowspan();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__SCOPE:
-				unsetScope();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TH_TYPE__VALIGN:
-				unsetValign();
-				return;
+		case XhtmlPackage.XHTML_TH_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__XHTML_FLOW_MIX:
+			getXhtmlFlowMix().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__H1:
+			getH1().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__H2:
+			getH2().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__H3:
+			getH3().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__H4:
+			getH4().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__H5:
+			getH5().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__H6:
+			getH6().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__UL:
+			getUl().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__OL:
+			getOl().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__DL:
+			getDl().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__P:
+			getP().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__DIV:
+			getDiv().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__PRE:
+			getPre().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__BLOCKQUOTE:
+			getBlockquote().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__ADDRESS:
+			getAddress().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__HR:
+			getHr().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__TABLE:
+			getTable().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__ABBR1:
+			setAbbr1(ABBR1_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__ALIGN:
+			unsetAlign();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__AXIS:
+			setAxis(AXIS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__CHAR:
+			setChar(CHAR_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__CHAROFF:
+			setCharoff(CHAROFF_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__COLSPAN:
+			unsetColspan();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__HEADERS:
+			setHeaders(HEADERS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__ROWSPAN:
+			unsetRowspan();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__SCOPE:
+			unsetScope();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TH_TYPE__VALIGN:
+			unsetValign();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TH_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__XHTML_FLOW_MIX:
-				return !getXhtmlFlowMix().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__H1:
-				return !getH1().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__H2:
-				return !getH2().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__H3:
-				return !getH3().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__H4:
-				return !getH4().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__H5:
-				return !getH5().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__H6:
-				return !getH6().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__UL:
-				return !getUl().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__OL:
-				return !getOl().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__DL:
-				return !getDl().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__P:
-				return !getP().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__DIV:
-				return !getDiv().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__PRE:
-				return !getPre().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__BLOCKQUOTE:
-				return !getBlockquote().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__ADDRESS:
-				return !getAddress().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__HR:
-				return !getHr().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__TABLE:
-				return !getTable().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_TH_TYPE__ABBR1:
-				return ABBR1_EDEFAULT == null ? abbr1 != null : !ABBR1_EDEFAULT.equals(abbr1);
-			case XhtmlPackage.XHTML_TH_TYPE__ALIGN:
-				return isSetAlign();
-			case XhtmlPackage.XHTML_TH_TYPE__AXIS:
-				return AXIS_EDEFAULT == null ? axis != null : !AXIS_EDEFAULT.equals(axis);
-			case XhtmlPackage.XHTML_TH_TYPE__CHAR:
-				return CHAR_EDEFAULT == null ? char_ != null : !CHAR_EDEFAULT.equals(char_);
-			case XhtmlPackage.XHTML_TH_TYPE__CHAROFF:
-				return CHAROFF_EDEFAULT == null ? charoff != null : !CHAROFF_EDEFAULT.equals(charoff);
-			case XhtmlPackage.XHTML_TH_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_TH_TYPE__COLSPAN:
-				return isSetColspan();
-			case XhtmlPackage.XHTML_TH_TYPE__HEADERS:
-				return HEADERS_EDEFAULT == null ? headers != null : !HEADERS_EDEFAULT.equals(headers);
-			case XhtmlPackage.XHTML_TH_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_TH_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_TH_TYPE__ROWSPAN:
-				return isSetRowspan();
-			case XhtmlPackage.XHTML_TH_TYPE__SCOPE:
-				return isSetScope();
-			case XhtmlPackage.XHTML_TH_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_TH_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_TH_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-			case XhtmlPackage.XHTML_TH_TYPE__VALIGN:
-				return isSetValign();
+		case XhtmlPackage.XHTML_TH_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__XHTML_FLOW_MIX:
+			return !getXhtmlFlowMix().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__H1:
+			return !getH1().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__H2:
+			return !getH2().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__H3:
+			return !getH3().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__H4:
+			return !getH4().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__H5:
+			return !getH5().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__H6:
+			return !getH6().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__UL:
+			return !getUl().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__OL:
+			return !getOl().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__DL:
+			return !getDl().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__P:
+			return !getP().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__DIV:
+			return !getDiv().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__PRE:
+			return !getPre().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__BLOCKQUOTE:
+			return !getBlockquote().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__ADDRESS:
+			return !getAddress().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__HR:
+			return !getHr().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__TABLE:
+			return !getTable().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_TH_TYPE__ABBR1:
+			return ABBR1_EDEFAULT == null ? abbr1 != null : !ABBR1_EDEFAULT.equals(abbr1);
+		case XhtmlPackage.XHTML_TH_TYPE__ALIGN:
+			return isSetAlign();
+		case XhtmlPackage.XHTML_TH_TYPE__AXIS:
+			return AXIS_EDEFAULT == null ? axis != null : !AXIS_EDEFAULT.equals(axis);
+		case XhtmlPackage.XHTML_TH_TYPE__CHAR:
+			return CHAR_EDEFAULT == null ? char_ != null : !CHAR_EDEFAULT.equals(char_);
+		case XhtmlPackage.XHTML_TH_TYPE__CHAROFF:
+			return CHAROFF_EDEFAULT == null ? charoff != null : !CHAROFF_EDEFAULT.equals(charoff);
+		case XhtmlPackage.XHTML_TH_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_TH_TYPE__COLSPAN:
+			return isSetColspan();
+		case XhtmlPackage.XHTML_TH_TYPE__HEADERS:
+			return HEADERS_EDEFAULT == null ? headers != null : !HEADERS_EDEFAULT.equals(headers);
+		case XhtmlPackage.XHTML_TH_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_TH_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_TH_TYPE__ROWSPAN:
+			return isSetRowspan();
+		case XhtmlPackage.XHTML_TH_TYPE__SCOPE:
+			return isSetScope();
+		case XhtmlPackage.XHTML_TH_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_TH_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_TH_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_TH_TYPE__VALIGN:
+			return isSetValign();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy()) {
+			return super.toString();
+		}
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", abbr1: ");
+		result.append(", abbr1: "); //$NON-NLS-1$
 		result.append(abbr1);
-		result.append(", align: ");
-		if (alignESet) result.append(align); else result.append("<unset>");
-		result.append(", axis: ");
+		result.append(", align: "); //$NON-NLS-1$
+		if (alignESet) {
+			result.append(align);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", axis: "); //$NON-NLS-1$
 		result.append(axis);
-		result.append(", char: ");
+		result.append(", char: "); //$NON-NLS-1$
 		result.append(char_);
-		result.append(", charoff: ");
+		result.append(", charoff: "); //$NON-NLS-1$
 		result.append(charoff);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", colspan: ");
-		if (colspanESet) result.append(colspan); else result.append("<unset>");
-		result.append(", headers: ");
+		result.append(", colspan: "); //$NON-NLS-1$
+		if (colspanESet) {
+			result.append(colspan);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", headers: "); //$NON-NLS-1$
 		result.append(headers);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", rowspan: ");
-		if (rowspanESet) result.append(rowspan); else result.append("<unset>");
-		result.append(", scope: ");
-		if (scopeESet) result.append(scope); else result.append("<unset>");
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", rowspan: "); //$NON-NLS-1$
+		if (rowspanESet) {
+			result.append(rowspan);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", scope: "); //$NON-NLS-1$
+		if (scopeESet) {
+			result.append(scope);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet) {
+			result.append(space);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
-		result.append(", valign: ");
-		if (valignESet) result.append(valign); else result.append("<unset>");
+		result.append(", valign: "); //$NON-NLS-1$
+		if (valignESet) {
+			result.append(valign);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlThTypeImpl
+} // XhtmlThTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTheadTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTheadTypeImpl.java
index 67a9944..23a09cb 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTheadTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTheadTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,20 +15,14 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.AlignType;
 import org.eclipse.rmf.reqif10.xhtml.ValignType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
@@ -36,33 +30,31 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlTrType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Thead Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Thead Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getTr <em>Tr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getAlign <em>Align</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getChar <em>Char</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getCharoff <em>Charoff</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getValign <em>Valign</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getTr <em>Tr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getAlign <em>Align</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getChar <em>Char</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getCharoff <em>Charoff</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTheadTypeImpl#getValign <em>Valign</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlTheadTypeImpl extends EObjectImpl implements XhtmlTheadType {
+public class XhtmlTheadTypeImpl extends MinimalEObjectImpl implements XhtmlTheadType {
 	/**
-	 * The cached value of the '{@link #getTr() <em>Tr</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTr() <em>Tr</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTr()
 	 * @generated
 	 * @ordered
@@ -70,9 +62,9 @@
 	protected EList<XhtmlTrType> tr;
 
 	/**
-	 * The default value of the '{@link #getAlign() <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAlign() <em>Align</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAlign()
 	 * @generated
 	 * @ordered
@@ -80,9 +72,9 @@
 	protected static final AlignType ALIGN_EDEFAULT = AlignType.LEFT;
 
 	/**
-	 * The cached value of the '{@link #getAlign() <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAlign() <em>Align</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getAlign()
 	 * @generated
 	 * @ordered
@@ -90,18 +82,17 @@
 	protected AlignType align = ALIGN_EDEFAULT;
 
 	/**
-	 * This is true if the Align attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Align attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean alignESet;
 
 	/**
-	 * The default value of the '{@link #getChar() <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getChar() <em>Char</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getChar()
 	 * @generated
 	 * @ordered
@@ -109,9 +100,9 @@
 	protected static final String CHAR_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getChar() <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getChar() <em>Char</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getChar()
 	 * @generated
 	 * @ordered
@@ -119,9 +110,9 @@
 	protected String char_ = CHAR_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCharoff() <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCharoff() <em>Charoff</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharoff()
 	 * @generated
 	 * @ordered
@@ -129,9 +120,9 @@
 	protected static final Object CHAROFF_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCharoff() <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCharoff() <em>Charoff</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharoff()
 	 * @generated
 	 * @ordered
@@ -139,9 +130,9 @@
 	protected Object charoff = CHAROFF_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -149,9 +140,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -159,9 +150,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -169,9 +159,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -179,9 +168,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -189,9 +178,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -199,9 +188,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -209,9 +198,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -219,18 +208,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -238,9 +226,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -248,9 +236,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -258,9 +246,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -268,9 +256,9 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getValign() <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValign() <em>Valign</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValign()
 	 * @generated
 	 * @ordered
@@ -278,9 +266,9 @@
 	protected static final ValignType VALIGN_EDEFAULT = ValignType.TOP;
 
 	/**
-	 * The cached value of the '{@link #getValign() <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getValign() <em>Valign</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValign()
 	 * @generated
 	 * @ordered
@@ -288,17 +276,16 @@
 	protected ValignType valign = VALIGN_EDEFAULT;
 
 	/**
-	 * This is true if the Valign attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Valign attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean valignESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlTheadTypeImpl() {
@@ -306,8 +293,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -316,8 +303,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlTrType> getTr() {
@@ -328,8 +315,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AlignType getAlign() {
@@ -337,8 +324,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAlign(AlignType newAlign) {
@@ -351,8 +338,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetAlign() {
@@ -365,8 +352,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetAlign() {
@@ -374,8 +361,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getChar() {
@@ -383,8 +370,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setChar(String newChar) {
@@ -395,8 +382,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getCharoff() {
@@ -404,8 +391,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCharoff(Object newCharoff) {
@@ -416,8 +403,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -425,8 +412,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -437,8 +424,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -446,8 +433,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -458,8 +445,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -467,8 +454,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -479,8 +466,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -488,8 +475,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -502,8 +489,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -516,8 +503,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -525,8 +512,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -534,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -546,8 +533,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -555,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -567,8 +554,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ValignType getValign() {
@@ -576,8 +563,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValign(ValignType newValign) {
@@ -590,8 +577,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetValign() {
@@ -604,8 +591,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetValign() {
@@ -613,211 +600,221 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_THEAD_TYPE__TR:
-				return ((InternalEList<?>)getTr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_THEAD_TYPE__TR:
+			return ((InternalEList<?>) getTr()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_THEAD_TYPE__TR:
-				return getTr();
-			case XhtmlPackage.XHTML_THEAD_TYPE__ALIGN:
-				return getAlign();
-			case XhtmlPackage.XHTML_THEAD_TYPE__CHAR:
-				return getChar();
-			case XhtmlPackage.XHTML_THEAD_TYPE__CHAROFF:
-				return getCharoff();
-			case XhtmlPackage.XHTML_THEAD_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_THEAD_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_THEAD_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_THEAD_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_THEAD_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_THEAD_TYPE__TITLE:
-				return getTitle();
-			case XhtmlPackage.XHTML_THEAD_TYPE__VALIGN:
-				return getValign();
+		case XhtmlPackage.XHTML_THEAD_TYPE__TR:
+			return getTr();
+		case XhtmlPackage.XHTML_THEAD_TYPE__ALIGN:
+			return getAlign();
+		case XhtmlPackage.XHTML_THEAD_TYPE__CHAR:
+			return getChar();
+		case XhtmlPackage.XHTML_THEAD_TYPE__CHAROFF:
+			return getCharoff();
+		case XhtmlPackage.XHTML_THEAD_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_THEAD_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_THEAD_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_THEAD_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_THEAD_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_THEAD_TYPE__TITLE:
+			return getTitle();
+		case XhtmlPackage.XHTML_THEAD_TYPE__VALIGN:
+			return getValign();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_THEAD_TYPE__TR:
-				getTr().clear();
-				getTr().addAll((Collection<? extends XhtmlTrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__ALIGN:
-				setAlign((AlignType)newValue);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__CHAR:
-				setChar((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__CHAROFF:
-				setCharoff(newValue);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__VALIGN:
-				setValign((ValignType)newValue);
-				return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__TR:
+			getTr().clear();
+			getTr().addAll((Collection<? extends XhtmlTrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__ALIGN:
+			setAlign((AlignType) newValue);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__CHAR:
+			setChar((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__CHAROFF:
+			setCharoff(newValue);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__VALIGN:
+			setValign((ValignType) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_THEAD_TYPE__TR:
-				getTr().clear();
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__ALIGN:
-				unsetAlign();
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__CHAR:
-				setChar(CHAR_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__CHAROFF:
-				setCharoff(CHAROFF_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_THEAD_TYPE__VALIGN:
-				unsetValign();
-				return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__TR:
+			getTr().clear();
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__ALIGN:
+			unsetAlign();
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__CHAR:
+			setChar(CHAR_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__CHAROFF:
+			setCharoff(CHAROFF_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_THEAD_TYPE__VALIGN:
+			unsetValign();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_THEAD_TYPE__TR:
-				return tr != null && !tr.isEmpty();
-			case XhtmlPackage.XHTML_THEAD_TYPE__ALIGN:
-				return isSetAlign();
-			case XhtmlPackage.XHTML_THEAD_TYPE__CHAR:
-				return CHAR_EDEFAULT == null ? char_ != null : !CHAR_EDEFAULT.equals(char_);
-			case XhtmlPackage.XHTML_THEAD_TYPE__CHAROFF:
-				return CHAROFF_EDEFAULT == null ? charoff != null : !CHAROFF_EDEFAULT.equals(charoff);
-			case XhtmlPackage.XHTML_THEAD_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_THEAD_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_THEAD_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_THEAD_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_THEAD_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_THEAD_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-			case XhtmlPackage.XHTML_THEAD_TYPE__VALIGN:
-				return isSetValign();
+		case XhtmlPackage.XHTML_THEAD_TYPE__TR:
+			return tr != null && !tr.isEmpty();
+		case XhtmlPackage.XHTML_THEAD_TYPE__ALIGN:
+			return isSetAlign();
+		case XhtmlPackage.XHTML_THEAD_TYPE__CHAR:
+			return CHAR_EDEFAULT == null ? char_ != null : !CHAR_EDEFAULT.equals(char_);
+		case XhtmlPackage.XHTML_THEAD_TYPE__CHAROFF:
+			return CHAROFF_EDEFAULT == null ? charoff != null : !CHAROFF_EDEFAULT.equals(charoff);
+		case XhtmlPackage.XHTML_THEAD_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_THEAD_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_THEAD_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_THEAD_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_THEAD_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_THEAD_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_THEAD_TYPE__VALIGN:
+			return isSetValign();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (align: ");
-		if (alignESet) result.append(align); else result.append("<unset>");
-		result.append(", char: ");
+		result.append(" (align: "); //$NON-NLS-1$
+		if (alignESet)
+			result.append(align);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", char: "); //$NON-NLS-1$
 		result.append(char_);
-		result.append(", charoff: ");
+		result.append(", charoff: "); //$NON-NLS-1$
 		result.append(charoff);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
-		result.append(", valign: ");
-		if (valignESet) result.append(valign); else result.append("<unset>");
+		result.append(", valign: "); //$NON-NLS-1$
+		if (valignESet)
+			result.append(valign);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlTheadTypeImpl
+} // XhtmlTheadTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTrTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTrTypeImpl.java
index f2868d6..74f78d5 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTrTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlTrTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.AlignType;
 import org.eclipse.rmf.reqif10.xhtml.ValignType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
@@ -38,35 +32,33 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlTrType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tr Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Tr Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getTh <em>Th</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getTd <em>Td</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getAlign <em>Align</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getChar <em>Char</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getCharoff <em>Charoff</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getValign <em>Valign</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getGroup <em>Group</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getTh <em>Th</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getTd <em>Td</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getAlign <em>Align</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getChar <em>Char</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getCharoff <em>Charoff</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlTrTypeImpl#getValign <em>Valign</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlTrTypeImpl extends EObjectImpl implements XhtmlTrType {
+public class XhtmlTrTypeImpl extends MinimalEObjectImpl implements XhtmlTrType {
 	/**
-	 * The cached value of the '{@link #getGroup() <em>Group</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getGroup() <em>Group</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getGroup()
 	 * @generated
 	 * @ordered
@@ -74,9 +66,9 @@
 	protected FeatureMap group;
 
 	/**
-	 * The default value of the '{@link #getAlign() <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAlign() <em>Align</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAlign()
 	 * @generated
 	 * @ordered
@@ -84,9 +76,9 @@
 	protected static final AlignType ALIGN_EDEFAULT = AlignType.LEFT;
 
 	/**
-	 * The cached value of the '{@link #getAlign() <em>Align</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAlign() <em>Align</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getAlign()
 	 * @generated
 	 * @ordered
@@ -94,18 +86,17 @@
 	protected AlignType align = ALIGN_EDEFAULT;
 
 	/**
-	 * This is true if the Align attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Align attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean alignESet;
 
 	/**
-	 * The default value of the '{@link #getChar() <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getChar() <em>Char</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getChar()
 	 * @generated
 	 * @ordered
@@ -113,9 +104,9 @@
 	protected static final String CHAR_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getChar() <em>Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getChar() <em>Char</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getChar()
 	 * @generated
 	 * @ordered
@@ -123,9 +114,9 @@
 	protected String char_ = CHAR_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCharoff() <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCharoff() <em>Charoff</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharoff()
 	 * @generated
 	 * @ordered
@@ -133,9 +124,9 @@
 	protected static final Object CHAROFF_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCharoff() <em>Charoff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCharoff() <em>Charoff</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getCharoff()
 	 * @generated
 	 * @ordered
@@ -143,9 +134,9 @@
 	protected Object charoff = CHAROFF_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -153,9 +144,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -163,9 +154,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -173,9 +163,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -183,9 +172,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -193,9 +182,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -203,9 +192,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -213,9 +202,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -223,18 +212,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -242,9 +230,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -252,9 +240,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -262,9 +250,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -272,9 +260,9 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getValign() <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValign() <em>Valign</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValign()
 	 * @generated
 	 * @ordered
@@ -282,9 +270,9 @@
 	protected static final ValignType VALIGN_EDEFAULT = ValignType.TOP;
 
 	/**
-	 * The cached value of the '{@link #getValign() <em>Valign</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getValign() <em>Valign</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValign()
 	 * @generated
 	 * @ordered
@@ -292,17 +280,16 @@
 	protected ValignType valign = VALIGN_EDEFAULT;
 
 	/**
-	 * This is true if the Valign attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Valign attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean valignESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlTrTypeImpl() {
@@ -310,8 +297,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -320,8 +307,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getGroup() {
@@ -332,8 +319,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlThType> getTh() {
@@ -341,8 +328,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlTdType> getTd() {
@@ -350,8 +337,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AlignType getAlign() {
@@ -359,8 +346,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAlign(AlignType newAlign) {
@@ -373,8 +360,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetAlign() {
@@ -387,8 +374,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetAlign() {
@@ -396,8 +383,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getChar() {
@@ -405,8 +392,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setChar(String newChar) {
@@ -417,8 +404,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getCharoff() {
@@ -426,8 +413,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCharoff(Object newCharoff) {
@@ -438,8 +425,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -447,8 +434,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -459,8 +446,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -468,8 +455,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -480,8 +467,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -489,8 +476,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -501,8 +488,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -510,8 +497,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -524,8 +511,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -538,8 +525,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -547,8 +534,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -556,8 +543,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -568,8 +555,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -577,8 +564,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -589,8 +576,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ValignType getValign() {
@@ -598,8 +585,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValign(ValignType newValign) {
@@ -612,8 +599,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetValign() {
@@ -626,8 +613,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetValign() {
@@ -635,239 +622,250 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TR_TYPE__GROUP:
-				return ((InternalEList<?>)getGroup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TR_TYPE__TH:
-				return ((InternalEList<?>)getTh()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_TR_TYPE__TD:
-				return ((InternalEList<?>)getTd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TR_TYPE__GROUP:
+			return ((InternalEList<?>) getGroup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TR_TYPE__TH:
+			return ((InternalEList<?>) getTh()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_TR_TYPE__TD:
+			return ((InternalEList<?>) getTd()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TR_TYPE__GROUP:
-				if (coreType) return getGroup();
-				return ((FeatureMap.Internal)getGroup()).getWrapper();
-			case XhtmlPackage.XHTML_TR_TYPE__TH:
-				return getTh();
-			case XhtmlPackage.XHTML_TR_TYPE__TD:
-				return getTd();
-			case XhtmlPackage.XHTML_TR_TYPE__ALIGN:
-				return getAlign();
-			case XhtmlPackage.XHTML_TR_TYPE__CHAR:
-				return getChar();
-			case XhtmlPackage.XHTML_TR_TYPE__CHAROFF:
-				return getCharoff();
-			case XhtmlPackage.XHTML_TR_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_TR_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_TR_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_TR_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_TR_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_TR_TYPE__TITLE:
-				return getTitle();
-			case XhtmlPackage.XHTML_TR_TYPE__VALIGN:
-				return getValign();
+		case XhtmlPackage.XHTML_TR_TYPE__GROUP:
+			if (coreType)
+				return getGroup();
+			return ((FeatureMap.Internal) getGroup()).getWrapper();
+		case XhtmlPackage.XHTML_TR_TYPE__TH:
+			return getTh();
+		case XhtmlPackage.XHTML_TR_TYPE__TD:
+			return getTd();
+		case XhtmlPackage.XHTML_TR_TYPE__ALIGN:
+			return getAlign();
+		case XhtmlPackage.XHTML_TR_TYPE__CHAR:
+			return getChar();
+		case XhtmlPackage.XHTML_TR_TYPE__CHAROFF:
+			return getCharoff();
+		case XhtmlPackage.XHTML_TR_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_TR_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_TR_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_TR_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_TR_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_TR_TYPE__TITLE:
+			return getTitle();
+		case XhtmlPackage.XHTML_TR_TYPE__VALIGN:
+			return getValign();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TR_TYPE__GROUP:
-				((FeatureMap.Internal)getGroup()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__TH:
-				getTh().clear();
-				getTh().addAll((Collection<? extends XhtmlThType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__TD:
-				getTd().clear();
-				getTd().addAll((Collection<? extends XhtmlTdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__ALIGN:
-				setAlign((AlignType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__CHAR:
-				setChar((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__CHAROFF:
-				setCharoff(newValue);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__VALIGN:
-				setValign((ValignType)newValue);
-				return;
+		case XhtmlPackage.XHTML_TR_TYPE__GROUP:
+			((FeatureMap.Internal) getGroup()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__TH:
+			getTh().clear();
+			getTh().addAll((Collection<? extends XhtmlThType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__TD:
+			getTd().clear();
+			getTd().addAll((Collection<? extends XhtmlTdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__ALIGN:
+			setAlign((AlignType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__CHAR:
+			setChar((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__CHAROFF:
+			setCharoff(newValue);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__VALIGN:
+			setValign((ValignType) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TR_TYPE__GROUP:
-				getGroup().clear();
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__TH:
-				getTh().clear();
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__TD:
-				getTd().clear();
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__ALIGN:
-				unsetAlign();
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__CHAR:
-				setChar(CHAR_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__CHAROFF:
-				setCharoff(CHAROFF_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_TR_TYPE__VALIGN:
-				unsetValign();
-				return;
+		case XhtmlPackage.XHTML_TR_TYPE__GROUP:
+			getGroup().clear();
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__TH:
+			getTh().clear();
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__TD:
+			getTd().clear();
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__ALIGN:
+			unsetAlign();
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__CHAR:
+			setChar(CHAR_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__CHAROFF:
+			setCharoff(CHAROFF_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_TR_TYPE__VALIGN:
+			unsetValign();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_TR_TYPE__GROUP:
-				return group != null && !group.isEmpty();
-			case XhtmlPackage.XHTML_TR_TYPE__TH:
-				return !getTh().isEmpty();
-			case XhtmlPackage.XHTML_TR_TYPE__TD:
-				return !getTd().isEmpty();
-			case XhtmlPackage.XHTML_TR_TYPE__ALIGN:
-				return isSetAlign();
-			case XhtmlPackage.XHTML_TR_TYPE__CHAR:
-				return CHAR_EDEFAULT == null ? char_ != null : !CHAR_EDEFAULT.equals(char_);
-			case XhtmlPackage.XHTML_TR_TYPE__CHAROFF:
-				return CHAROFF_EDEFAULT == null ? charoff != null : !CHAROFF_EDEFAULT.equals(charoff);
-			case XhtmlPackage.XHTML_TR_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_TR_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_TR_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_TR_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_TR_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_TR_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-			case XhtmlPackage.XHTML_TR_TYPE__VALIGN:
-				return isSetValign();
+		case XhtmlPackage.XHTML_TR_TYPE__GROUP:
+			return group != null && !group.isEmpty();
+		case XhtmlPackage.XHTML_TR_TYPE__TH:
+			return !getTh().isEmpty();
+		case XhtmlPackage.XHTML_TR_TYPE__TD:
+			return !getTd().isEmpty();
+		case XhtmlPackage.XHTML_TR_TYPE__ALIGN:
+			return isSetAlign();
+		case XhtmlPackage.XHTML_TR_TYPE__CHAR:
+			return CHAR_EDEFAULT == null ? char_ != null : !CHAR_EDEFAULT.equals(char_);
+		case XhtmlPackage.XHTML_TR_TYPE__CHAROFF:
+			return CHAROFF_EDEFAULT == null ? charoff != null : !CHAROFF_EDEFAULT.equals(charoff);
+		case XhtmlPackage.XHTML_TR_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_TR_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_TR_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_TR_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_TR_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_TR_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_TR_TYPE__VALIGN:
+			return isSetValign();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group: ");
+		result.append(" (group: "); //$NON-NLS-1$
 		result.append(group);
-		result.append(", align: ");
-		if (alignESet) result.append(align); else result.append("<unset>");
-		result.append(", char: ");
+		result.append(", align: "); //$NON-NLS-1$
+		if (alignESet)
+			result.append(align);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", char: "); //$NON-NLS-1$
 		result.append(char_);
-		result.append(", charoff: ");
+		result.append(", charoff: "); //$NON-NLS-1$
 		result.append(charoff);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
-		result.append(", valign: ");
-		if (valignESet) result.append(valign); else result.append("<unset>");
+		result.append(", valign: "); //$NON-NLS-1$
+		if (valignESet)
+			result.append(valign);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlTrTypeImpl
+} // XhtmlTrTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlUlTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlUlTypeImpl.java
index 113be96..9686f73 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlUlTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlUlTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,48 +15,40 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlLiType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlUlType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Ul Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Ul Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlUlTypeImpl#getLi <em>Li</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlUlTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlUlTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlUlTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlUlTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlUlTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlUlTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlUlTypeImpl#getLi <em>Li</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlUlTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlUlTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlUlTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlUlTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlUlTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlUlTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlUlTypeImpl extends EObjectImpl implements XhtmlUlType {
+public class XhtmlUlTypeImpl extends MinimalEObjectImpl implements XhtmlUlType {
 	/**
-	 * The cached value of the '{@link #getLi() <em>Li</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLi() <em>Li</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getLi()
 	 * @generated
 	 * @ordered
@@ -64,9 +56,9 @@
 	protected EList<XhtmlLiType> li;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -74,9 +66,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -84,9 +76,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -94,9 +85,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -104,9 +94,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -114,9 +104,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -124,9 +114,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -134,9 +124,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -144,18 +134,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -163,9 +152,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -173,9 +162,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -183,9 +172,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -193,8 +182,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlUlTypeImpl() {
@@ -202,8 +191,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -212,8 +201,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlLiType> getLi() {
@@ -224,8 +213,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -233,8 +222,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -245,8 +234,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -254,8 +243,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -266,8 +255,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -275,8 +264,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -287,8 +276,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -296,8 +285,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -310,8 +299,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -324,8 +313,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -333,8 +322,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -342,8 +331,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -354,8 +343,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -363,8 +352,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -375,163 +364,167 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_UL_TYPE__LI:
-				return ((InternalEList<?>)getLi()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_UL_TYPE__LI:
+			return ((InternalEList<?>) getLi()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_UL_TYPE__LI:
-				return getLi();
-			case XhtmlPackage.XHTML_UL_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_UL_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_UL_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_UL_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_UL_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_UL_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_UL_TYPE__LI:
+			return getLi();
+		case XhtmlPackage.XHTML_UL_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_UL_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_UL_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_UL_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_UL_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_UL_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_UL_TYPE__LI:
-				getLi().clear();
-				getLi().addAll((Collection<? extends XhtmlLiType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_UL_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_UL_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_UL_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_UL_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_UL_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_UL_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_UL_TYPE__LI:
+			getLi().clear();
+			getLi().addAll((Collection<? extends XhtmlLiType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_UL_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_UL_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_UL_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_UL_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_UL_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_UL_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_UL_TYPE__LI:
-				getLi().clear();
-				return;
-			case XhtmlPackage.XHTML_UL_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_UL_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_UL_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_UL_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_UL_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_UL_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_UL_TYPE__LI:
+			getLi().clear();
+			return;
+		case XhtmlPackage.XHTML_UL_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_UL_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_UL_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_UL_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_UL_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_UL_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_UL_TYPE__LI:
-				return li != null && !li.isEmpty();
-			case XhtmlPackage.XHTML_UL_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_UL_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_UL_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_UL_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_UL_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_UL_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_UL_TYPE__LI:
+			return li != null && !li.isEmpty();
+		case XhtmlPackage.XHTML_UL_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_UL_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_UL_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_UL_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_UL_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_UL_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (class: ");
+		result.append(" (class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlUlTypeImpl
+} // XhtmlUlTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlVarTypeImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlVarTypeImpl.java
index ee312c7..7836071 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlVarTypeImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/impl/XhtmlVarTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,21 +15,15 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.BasicFeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.emf.ecore.xml.namespace.SpaceType;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
@@ -50,54 +44,52 @@
 import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Var Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Var Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getBr <em>Br</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getSpan <em>Span</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getEm <em>Em</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getStrong <em>Strong</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getDfn <em>Dfn</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getSamp <em>Samp</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getKbd <em>Kbd</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getVar <em>Var</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getCite <em>Cite</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getAbbr <em>Abbr</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getAcronym <em>Acronym</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getQ <em>Q</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getTt <em>Tt</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getBig <em>Big</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getSmall <em>Small</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getSub <em>Sub</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getSup <em>Sup</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getIns <em>Ins</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getDel <em>Del</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getMixed <em>Mixed</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getXhtmlInlineMix <em>Xhtml Inline Mix</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getBr <em>Br</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getSpan <em>Span</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getEm <em>Em</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getStrong <em>Strong</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getDfn <em>Dfn</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getCode <em>Code</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getSamp <em>Samp</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getKbd <em>Kbd</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getVar <em>Var</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getCite <em>Cite</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getAbbr <em>Abbr</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getAcronym <em>Acronym</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getQ <em>Q</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getTt <em>Tt</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getI <em>I</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getBig <em>Big</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getSmall <em>Small</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getSub <em>Sub</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getSup <em>Sup</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getIns <em>Ins</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getDel <em>Del</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getClass_ <em>Class</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getSpace <em>Space</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.xhtml.impl.XhtmlVarTypeImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlVarTypeImpl extends EObjectImpl implements XhtmlVarType {
+public class XhtmlVarTypeImpl extends MinimalEObjectImpl implements XhtmlVarType {
 	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMixed()
 	 * @generated
 	 * @ordered
@@ -105,9 +97,9 @@
 	protected FeatureMap mixed;
 
 	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -115,9 +107,9 @@
 	protected static final String CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -125,9 +117,8 @@
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -135,9 +126,8 @@
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -145,9 +135,9 @@
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -155,9 +145,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -165,9 +155,9 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -175,9 +165,9 @@
 	protected static final SpaceType SPACE_EDEFAULT = SpaceType.PRESERVE_LITERAL;
 
 	/**
-	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpace() <em>Space</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSpace()
 	 * @generated
 	 * @ordered
@@ -185,18 +175,17 @@
 	protected SpaceType space = SPACE_EDEFAULT;
 
 	/**
-	 * This is true if the Space attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Space attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean spaceESet;
 
 	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -204,9 +193,9 @@
 	protected static final String STYLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -214,9 +203,9 @@
 	protected String style = STYLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -224,9 +213,9 @@
 	protected static final String TITLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -234,8 +223,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlVarTypeImpl() {
@@ -243,8 +232,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -253,8 +242,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getMixed() {
@@ -265,17 +254,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureMap getXhtmlInlineMix() {
-		return (FeatureMap)getMixed().<FeatureMap.Entry>list(XhtmlPackage.eINSTANCE.getXhtmlVarType_XhtmlInlineMix());
+		return (FeatureMap) getMixed().<FeatureMap.Entry> list(XhtmlPackage.eINSTANCE.getXhtmlVarType_XhtmlInlineMix());
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlBrType> getBr() {
@@ -283,8 +272,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSpanType> getSpan() {
@@ -292,8 +281,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEmType> getEm() {
@@ -301,8 +290,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlStrongType> getStrong() {
@@ -310,8 +299,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlDfnType> getDfn() {
@@ -319,8 +308,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCodeType> getCode() {
@@ -328,8 +317,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlSampType> getSamp() {
@@ -337,8 +326,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlKbdType> getKbd() {
@@ -346,8 +335,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlVarType> getVar() {
@@ -355,8 +344,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlCiteType> getCite() {
@@ -364,8 +353,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAbbrType> getAbbr() {
@@ -373,8 +362,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAcronymType> getAcronym() {
@@ -382,8 +371,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlQType> getQ() {
@@ -391,8 +380,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getTt() {
@@ -400,8 +389,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getI() {
@@ -409,8 +398,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getB() {
@@ -418,8 +407,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getBig() {
@@ -427,8 +416,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSmall() {
@@ -436,8 +425,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSub() {
@@ -445,8 +434,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlInlPresType> getSup() {
@@ -454,8 +443,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlAType> getA() {
@@ -463,8 +452,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlObjectType> getObject() {
@@ -472,8 +461,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getIns() {
@@ -481,8 +470,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<XhtmlEditType> getDel() {
@@ -490,8 +479,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClass_() {
@@ -499,8 +488,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClass(String newClass) {
@@ -511,8 +500,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -520,8 +509,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -532,8 +521,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -541,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -553,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpaceType getSpace() {
@@ -562,8 +551,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSpace(SpaceType newSpace) {
@@ -576,8 +565,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpace() {
@@ -590,8 +579,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpace() {
@@ -599,8 +588,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStyle() {
@@ -608,8 +597,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(String newStyle) {
@@ -620,8 +609,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -629,8 +618,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -641,490 +630,496 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_VAR_TYPE__MIXED:
-				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__XHTML_INLINE_MIX:
-				return ((InternalEList<?>)getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__BR:
-				return ((InternalEList<?>)getBr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__SPAN:
-				return ((InternalEList<?>)getSpan()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__EM:
-				return ((InternalEList<?>)getEm()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__STRONG:
-				return ((InternalEList<?>)getStrong()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__DFN:
-				return ((InternalEList<?>)getDfn()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__CODE:
-				return ((InternalEList<?>)getCode()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__SAMP:
-				return ((InternalEList<?>)getSamp()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__KBD:
-				return ((InternalEList<?>)getKbd()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__VAR:
-				return ((InternalEList<?>)getVar()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__CITE:
-				return ((InternalEList<?>)getCite()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__ABBR:
-				return ((InternalEList<?>)getAbbr()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__ACRONYM:
-				return ((InternalEList<?>)getAcronym()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__Q:
-				return ((InternalEList<?>)getQ()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__TT:
-				return ((InternalEList<?>)getTt()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__I:
-				return ((InternalEList<?>)getI()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__B:
-				return ((InternalEList<?>)getB()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__BIG:
-				return ((InternalEList<?>)getBig()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__SMALL:
-				return ((InternalEList<?>)getSmall()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__SUB:
-				return ((InternalEList<?>)getSub()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__SUP:
-				return ((InternalEList<?>)getSup()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__A:
-				return ((InternalEList<?>)getA()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__OBJECT:
-				return ((InternalEList<?>)getObject()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__INS:
-				return ((InternalEList<?>)getIns()).basicRemove(otherEnd, msgs);
-			case XhtmlPackage.XHTML_VAR_TYPE__DEL:
-				return ((InternalEList<?>)getDel()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__MIXED:
+			return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__XHTML_INLINE_MIX:
+			return ((InternalEList<?>) getXhtmlInlineMix()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__BR:
+			return ((InternalEList<?>) getBr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__SPAN:
+			return ((InternalEList<?>) getSpan()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__EM:
+			return ((InternalEList<?>) getEm()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__STRONG:
+			return ((InternalEList<?>) getStrong()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__DFN:
+			return ((InternalEList<?>) getDfn()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__CODE:
+			return ((InternalEList<?>) getCode()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__SAMP:
+			return ((InternalEList<?>) getSamp()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__KBD:
+			return ((InternalEList<?>) getKbd()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__VAR:
+			return ((InternalEList<?>) getVar()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__CITE:
+			return ((InternalEList<?>) getCite()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__ABBR:
+			return ((InternalEList<?>) getAbbr()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__ACRONYM:
+			return ((InternalEList<?>) getAcronym()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__Q:
+			return ((InternalEList<?>) getQ()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__TT:
+			return ((InternalEList<?>) getTt()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__I:
+			return ((InternalEList<?>) getI()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__B:
+			return ((InternalEList<?>) getB()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__BIG:
+			return ((InternalEList<?>) getBig()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__SMALL:
+			return ((InternalEList<?>) getSmall()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__SUB:
+			return ((InternalEList<?>) getSub()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__SUP:
+			return ((InternalEList<?>) getSup()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__A:
+			return ((InternalEList<?>) getA()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__OBJECT:
+			return ((InternalEList<?>) getObject()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__INS:
+			return ((InternalEList<?>) getIns()).basicRemove(otherEnd, msgs);
+		case XhtmlPackage.XHTML_VAR_TYPE__DEL:
+			return ((InternalEList<?>) getDel()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_VAR_TYPE__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case XhtmlPackage.XHTML_VAR_TYPE__XHTML_INLINE_MIX:
-				if (coreType) return getXhtmlInlineMix();
-				return ((FeatureMap.Internal)getXhtmlInlineMix()).getWrapper();
-			case XhtmlPackage.XHTML_VAR_TYPE__BR:
-				return getBr();
-			case XhtmlPackage.XHTML_VAR_TYPE__SPAN:
-				return getSpan();
-			case XhtmlPackage.XHTML_VAR_TYPE__EM:
-				return getEm();
-			case XhtmlPackage.XHTML_VAR_TYPE__STRONG:
-				return getStrong();
-			case XhtmlPackage.XHTML_VAR_TYPE__DFN:
-				return getDfn();
-			case XhtmlPackage.XHTML_VAR_TYPE__CODE:
-				return getCode();
-			case XhtmlPackage.XHTML_VAR_TYPE__SAMP:
-				return getSamp();
-			case XhtmlPackage.XHTML_VAR_TYPE__KBD:
-				return getKbd();
-			case XhtmlPackage.XHTML_VAR_TYPE__VAR:
-				return getVar();
-			case XhtmlPackage.XHTML_VAR_TYPE__CITE:
-				return getCite();
-			case XhtmlPackage.XHTML_VAR_TYPE__ABBR:
-				return getAbbr();
-			case XhtmlPackage.XHTML_VAR_TYPE__ACRONYM:
-				return getAcronym();
-			case XhtmlPackage.XHTML_VAR_TYPE__Q:
-				return getQ();
-			case XhtmlPackage.XHTML_VAR_TYPE__TT:
-				return getTt();
-			case XhtmlPackage.XHTML_VAR_TYPE__I:
-				return getI();
-			case XhtmlPackage.XHTML_VAR_TYPE__B:
-				return getB();
-			case XhtmlPackage.XHTML_VAR_TYPE__BIG:
-				return getBig();
-			case XhtmlPackage.XHTML_VAR_TYPE__SMALL:
-				return getSmall();
-			case XhtmlPackage.XHTML_VAR_TYPE__SUB:
-				return getSub();
-			case XhtmlPackage.XHTML_VAR_TYPE__SUP:
-				return getSup();
-			case XhtmlPackage.XHTML_VAR_TYPE__A:
-				return getA();
-			case XhtmlPackage.XHTML_VAR_TYPE__OBJECT:
-				return getObject();
-			case XhtmlPackage.XHTML_VAR_TYPE__INS:
-				return getIns();
-			case XhtmlPackage.XHTML_VAR_TYPE__DEL:
-				return getDel();
-			case XhtmlPackage.XHTML_VAR_TYPE__CLASS:
-				return getClass_();
-			case XhtmlPackage.XHTML_VAR_TYPE__ID:
-				return getId();
-			case XhtmlPackage.XHTML_VAR_TYPE__LANG:
-				return getLang();
-			case XhtmlPackage.XHTML_VAR_TYPE__SPACE:
-				return getSpace();
-			case XhtmlPackage.XHTML_VAR_TYPE__STYLE:
-				return getStyle();
-			case XhtmlPackage.XHTML_VAR_TYPE__TITLE:
-				return getTitle();
+		case XhtmlPackage.XHTML_VAR_TYPE__MIXED:
+			if (coreType)
+				return getMixed();
+			return ((FeatureMap.Internal) getMixed()).getWrapper();
+		case XhtmlPackage.XHTML_VAR_TYPE__XHTML_INLINE_MIX:
+			if (coreType)
+				return getXhtmlInlineMix();
+			return ((FeatureMap.Internal) getXhtmlInlineMix()).getWrapper();
+		case XhtmlPackage.XHTML_VAR_TYPE__BR:
+			return getBr();
+		case XhtmlPackage.XHTML_VAR_TYPE__SPAN:
+			return getSpan();
+		case XhtmlPackage.XHTML_VAR_TYPE__EM:
+			return getEm();
+		case XhtmlPackage.XHTML_VAR_TYPE__STRONG:
+			return getStrong();
+		case XhtmlPackage.XHTML_VAR_TYPE__DFN:
+			return getDfn();
+		case XhtmlPackage.XHTML_VAR_TYPE__CODE:
+			return getCode();
+		case XhtmlPackage.XHTML_VAR_TYPE__SAMP:
+			return getSamp();
+		case XhtmlPackage.XHTML_VAR_TYPE__KBD:
+			return getKbd();
+		case XhtmlPackage.XHTML_VAR_TYPE__VAR:
+			return getVar();
+		case XhtmlPackage.XHTML_VAR_TYPE__CITE:
+			return getCite();
+		case XhtmlPackage.XHTML_VAR_TYPE__ABBR:
+			return getAbbr();
+		case XhtmlPackage.XHTML_VAR_TYPE__ACRONYM:
+			return getAcronym();
+		case XhtmlPackage.XHTML_VAR_TYPE__Q:
+			return getQ();
+		case XhtmlPackage.XHTML_VAR_TYPE__TT:
+			return getTt();
+		case XhtmlPackage.XHTML_VAR_TYPE__I:
+			return getI();
+		case XhtmlPackage.XHTML_VAR_TYPE__B:
+			return getB();
+		case XhtmlPackage.XHTML_VAR_TYPE__BIG:
+			return getBig();
+		case XhtmlPackage.XHTML_VAR_TYPE__SMALL:
+			return getSmall();
+		case XhtmlPackage.XHTML_VAR_TYPE__SUB:
+			return getSub();
+		case XhtmlPackage.XHTML_VAR_TYPE__SUP:
+			return getSup();
+		case XhtmlPackage.XHTML_VAR_TYPE__A:
+			return getA();
+		case XhtmlPackage.XHTML_VAR_TYPE__OBJECT:
+			return getObject();
+		case XhtmlPackage.XHTML_VAR_TYPE__INS:
+			return getIns();
+		case XhtmlPackage.XHTML_VAR_TYPE__DEL:
+			return getDel();
+		case XhtmlPackage.XHTML_VAR_TYPE__CLASS:
+			return getClass_();
+		case XhtmlPackage.XHTML_VAR_TYPE__ID:
+			return getId();
+		case XhtmlPackage.XHTML_VAR_TYPE__LANG:
+			return getLang();
+		case XhtmlPackage.XHTML_VAR_TYPE__SPACE:
+			return getSpace();
+		case XhtmlPackage.XHTML_VAR_TYPE__STYLE:
+			return getStyle();
+		case XhtmlPackage.XHTML_VAR_TYPE__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_VAR_TYPE__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__XHTML_INLINE_MIX:
-				((FeatureMap.Internal)getXhtmlInlineMix()).set(newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__BR:
-				getBr().clear();
-				getBr().addAll((Collection<? extends XhtmlBrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__SPAN:
-				getSpan().clear();
-				getSpan().addAll((Collection<? extends XhtmlSpanType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__EM:
-				getEm().clear();
-				getEm().addAll((Collection<? extends XhtmlEmType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__STRONG:
-				getStrong().clear();
-				getStrong().addAll((Collection<? extends XhtmlStrongType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__DFN:
-				getDfn().clear();
-				getDfn().addAll((Collection<? extends XhtmlDfnType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__CODE:
-				getCode().clear();
-				getCode().addAll((Collection<? extends XhtmlCodeType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__SAMP:
-				getSamp().clear();
-				getSamp().addAll((Collection<? extends XhtmlSampType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__KBD:
-				getKbd().clear();
-				getKbd().addAll((Collection<? extends XhtmlKbdType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__VAR:
-				getVar().clear();
-				getVar().addAll((Collection<? extends XhtmlVarType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__CITE:
-				getCite().clear();
-				getCite().addAll((Collection<? extends XhtmlCiteType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__ABBR:
-				getAbbr().clear();
-				getAbbr().addAll((Collection<? extends XhtmlAbbrType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__ACRONYM:
-				getAcronym().clear();
-				getAcronym().addAll((Collection<? extends XhtmlAcronymType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__Q:
-				getQ().clear();
-				getQ().addAll((Collection<? extends XhtmlQType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__TT:
-				getTt().clear();
-				getTt().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__I:
-				getI().clear();
-				getI().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__B:
-				getB().clear();
-				getB().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__BIG:
-				getBig().clear();
-				getBig().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__SMALL:
-				getSmall().clear();
-				getSmall().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__SUB:
-				getSub().clear();
-				getSub().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__SUP:
-				getSup().clear();
-				getSup().addAll((Collection<? extends XhtmlInlPresType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__A:
-				getA().clear();
-				getA().addAll((Collection<? extends XhtmlAType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__OBJECT:
-				getObject().clear();
-				getObject().addAll((Collection<? extends XhtmlObjectType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__INS:
-				getIns().clear();
-				getIns().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__DEL:
-				getDel().clear();
-				getDel().addAll((Collection<? extends XhtmlEditType>)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__CLASS:
-				setClass((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__ID:
-				setId((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__SPACE:
-				setSpace((SpaceType)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__STYLE:
-				setStyle((String)newValue);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__TITLE:
-				setTitle((String)newValue);
-				return;
+		case XhtmlPackage.XHTML_VAR_TYPE__MIXED:
+			((FeatureMap.Internal) getMixed()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__XHTML_INLINE_MIX:
+			((FeatureMap.Internal) getXhtmlInlineMix()).set(newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__BR:
+			getBr().clear();
+			getBr().addAll((Collection<? extends XhtmlBrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__SPAN:
+			getSpan().clear();
+			getSpan().addAll((Collection<? extends XhtmlSpanType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__EM:
+			getEm().clear();
+			getEm().addAll((Collection<? extends XhtmlEmType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__STRONG:
+			getStrong().clear();
+			getStrong().addAll((Collection<? extends XhtmlStrongType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__DFN:
+			getDfn().clear();
+			getDfn().addAll((Collection<? extends XhtmlDfnType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__CODE:
+			getCode().clear();
+			getCode().addAll((Collection<? extends XhtmlCodeType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__SAMP:
+			getSamp().clear();
+			getSamp().addAll((Collection<? extends XhtmlSampType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__KBD:
+			getKbd().clear();
+			getKbd().addAll((Collection<? extends XhtmlKbdType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__VAR:
+			getVar().clear();
+			getVar().addAll((Collection<? extends XhtmlVarType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__CITE:
+			getCite().clear();
+			getCite().addAll((Collection<? extends XhtmlCiteType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__ABBR:
+			getAbbr().clear();
+			getAbbr().addAll((Collection<? extends XhtmlAbbrType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__ACRONYM:
+			getAcronym().clear();
+			getAcronym().addAll((Collection<? extends XhtmlAcronymType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__Q:
+			getQ().clear();
+			getQ().addAll((Collection<? extends XhtmlQType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__TT:
+			getTt().clear();
+			getTt().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__I:
+			getI().clear();
+			getI().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__B:
+			getB().clear();
+			getB().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__BIG:
+			getBig().clear();
+			getBig().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__SMALL:
+			getSmall().clear();
+			getSmall().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__SUB:
+			getSub().clear();
+			getSub().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__SUP:
+			getSup().clear();
+			getSup().addAll((Collection<? extends XhtmlInlPresType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__A:
+			getA().clear();
+			getA().addAll((Collection<? extends XhtmlAType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__OBJECT:
+			getObject().clear();
+			getObject().addAll((Collection<? extends XhtmlObjectType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__INS:
+			getIns().clear();
+			getIns().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__DEL:
+			getDel().clear();
+			getDel().addAll((Collection<? extends XhtmlEditType>) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__CLASS:
+			setClass((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__ID:
+			setId((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__LANG:
+			setLang((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__SPACE:
+			setSpace((SpaceType) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__STYLE:
+			setStyle((String) newValue);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_VAR_TYPE__MIXED:
-				getMixed().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__XHTML_INLINE_MIX:
-				getXhtmlInlineMix().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__BR:
-				getBr().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__SPAN:
-				getSpan().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__EM:
-				getEm().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__STRONG:
-				getStrong().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__DFN:
-				getDfn().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__CODE:
-				getCode().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__SAMP:
-				getSamp().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__KBD:
-				getKbd().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__VAR:
-				getVar().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__CITE:
-				getCite().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__ABBR:
-				getAbbr().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__ACRONYM:
-				getAcronym().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__Q:
-				getQ().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__TT:
-				getTt().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__I:
-				getI().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__B:
-				getB().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__BIG:
-				getBig().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__SMALL:
-				getSmall().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__SUB:
-				getSub().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__SUP:
-				getSup().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__A:
-				getA().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__OBJECT:
-				getObject().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__INS:
-				getIns().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__DEL:
-				getDel().clear();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__SPACE:
-				unsetSpace();
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-			case XhtmlPackage.XHTML_VAR_TYPE__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
+		case XhtmlPackage.XHTML_VAR_TYPE__MIXED:
+			getMixed().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__XHTML_INLINE_MIX:
+			getXhtmlInlineMix().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__BR:
+			getBr().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__SPAN:
+			getSpan().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__EM:
+			getEm().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__STRONG:
+			getStrong().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__DFN:
+			getDfn().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__CODE:
+			getCode().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__SAMP:
+			getSamp().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__KBD:
+			getKbd().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__VAR:
+			getVar().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__CITE:
+			getCite().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__ABBR:
+			getAbbr().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__ACRONYM:
+			getAcronym().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__Q:
+			getQ().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__TT:
+			getTt().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__I:
+			getI().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__B:
+			getB().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__BIG:
+			getBig().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__SMALL:
+			getSmall().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__SUB:
+			getSub().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__SUP:
+			getSup().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__A:
+			getA().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__OBJECT:
+			getObject().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__INS:
+			getIns().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__DEL:
+			getDel().clear();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__CLASS:
+			setClass(CLASS_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__ID:
+			setId(ID_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__LANG:
+			setLang(LANG_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__SPACE:
+			unsetSpace();
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		case XhtmlPackage.XHTML_VAR_TYPE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case XhtmlPackage.XHTML_VAR_TYPE__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__XHTML_INLINE_MIX:
-				return !getXhtmlInlineMix().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__BR:
-				return !getBr().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__SPAN:
-				return !getSpan().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__EM:
-				return !getEm().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__STRONG:
-				return !getStrong().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__DFN:
-				return !getDfn().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__CODE:
-				return !getCode().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__SAMP:
-				return !getSamp().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__KBD:
-				return !getKbd().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__VAR:
-				return !getVar().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__CITE:
-				return !getCite().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__ABBR:
-				return !getAbbr().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__ACRONYM:
-				return !getAcronym().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__Q:
-				return !getQ().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__TT:
-				return !getTt().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__I:
-				return !getI().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__B:
-				return !getB().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__BIG:
-				return !getBig().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__SMALL:
-				return !getSmall().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__SUB:
-				return !getSub().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__SUP:
-				return !getSup().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__A:
-				return !getA().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__OBJECT:
-				return !getObject().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__INS:
-				return !getIns().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__DEL:
-				return !getDel().isEmpty();
-			case XhtmlPackage.XHTML_VAR_TYPE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case XhtmlPackage.XHTML_VAR_TYPE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case XhtmlPackage.XHTML_VAR_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case XhtmlPackage.XHTML_VAR_TYPE__SPACE:
-				return isSetSpace();
-			case XhtmlPackage.XHTML_VAR_TYPE__STYLE:
-				return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-			case XhtmlPackage.XHTML_VAR_TYPE__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case XhtmlPackage.XHTML_VAR_TYPE__MIXED:
+			return mixed != null && !mixed.isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__XHTML_INLINE_MIX:
+			return !getXhtmlInlineMix().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__BR:
+			return !getBr().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__SPAN:
+			return !getSpan().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__EM:
+			return !getEm().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__STRONG:
+			return !getStrong().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__DFN:
+			return !getDfn().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__CODE:
+			return !getCode().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__SAMP:
+			return !getSamp().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__KBD:
+			return !getKbd().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__VAR:
+			return !getVar().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__CITE:
+			return !getCite().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__ABBR:
+			return !getAbbr().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__ACRONYM:
+			return !getAcronym().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__Q:
+			return !getQ().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__TT:
+			return !getTt().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__I:
+			return !getI().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__B:
+			return !getB().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__BIG:
+			return !getBig().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__SMALL:
+			return !getSmall().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__SUB:
+			return !getSub().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__SUP:
+			return !getSup().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__A:
+			return !getA().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__OBJECT:
+			return !getObject().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__INS:
+			return !getIns().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__DEL:
+			return !getDel().isEmpty();
+		case XhtmlPackage.XHTML_VAR_TYPE__CLASS:
+			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+		case XhtmlPackage.XHTML_VAR_TYPE__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case XhtmlPackage.XHTML_VAR_TYPE__LANG:
+			return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
+		case XhtmlPackage.XHTML_VAR_TYPE__SPACE:
+			return isSetSpace();
+		case XhtmlPackage.XHTML_VAR_TYPE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		case XhtmlPackage.XHTML_VAR_TYPE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
+		result.append(" (mixed: "); //$NON-NLS-1$
 		result.append(mixed);
-		result.append(", class: ");
+		result.append(", class: "); //$NON-NLS-1$
 		result.append(class_);
-		result.append(", id: ");
+		result.append(", id: "); //$NON-NLS-1$
 		result.append(id);
-		result.append(", lang: ");
+		result.append(", lang: "); //$NON-NLS-1$
 		result.append(lang);
-		result.append(", space: ");
-		if (spaceESet) result.append(space); else result.append("<unset>");
-		result.append(", style: ");
+		result.append(", space: "); //$NON-NLS-1$
+		if (spaceESet)
+			result.append(space);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", style: "); //$NON-NLS-1$
 		result.append(style);
-		result.append(", title: ");
+		result.append(", title: "); //$NON-NLS-1$
 		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlVarTypeImpl
+} // XhtmlVarTypeImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlAdapterFactory.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlAdapterFactory.java
index 5f6f435..022b699 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlAdapterFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,34 +13,76 @@
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
-
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
 import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.rmf.reqif10.xhtml.*;
+import org.eclipse.rmf.reqif10.xhtml.DocumentRoot;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlBrType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlColType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlDdType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlDivType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlDlType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlDtType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlEditType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlEmType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlHrType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlLiType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlOlType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlPType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlParamType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlPreType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlQType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlSampType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTableType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTdType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlThType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTrType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlUlType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
+ * method for each class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage
  * @generated
  */
 public class XhtmlAdapterFactory extends AdapterFactoryImpl {
 	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static XhtmlPackage modelPackage;
 
 	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlAdapterFactory() {
@@ -50,10 +92,10 @@
 	}
 
 	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
+	 * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This
+	 * implementation returns <code>true</code> if the object is either the model's package or is an instance object of
+	 * the model. <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
@@ -63,237 +105,282 @@
 			return true;
 		}
 		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
+			return ((EObject) object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
 	}
 
 	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected XhtmlSwitch<Adapter> modelSwitch =
-		new XhtmlSwitch<Adapter>() {
-			@Override
-			public Adapter caseDocumentRoot(DocumentRoot object) {
-				return createDocumentRootAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlAbbrType(XhtmlAbbrType object) {
-				return createXhtmlAbbrTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlAcronymType(XhtmlAcronymType object) {
-				return createXhtmlAcronymTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlAddressType(XhtmlAddressType object) {
-				return createXhtmlAddressTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlAType(XhtmlAType object) {
-				return createXhtmlATypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlBlockquoteType(XhtmlBlockquoteType object) {
-				return createXhtmlBlockquoteTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlBrType(XhtmlBrType object) {
-				return createXhtmlBrTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlCaptionType(XhtmlCaptionType object) {
-				return createXhtmlCaptionTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlCiteType(XhtmlCiteType object) {
-				return createXhtmlCiteTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlCodeType(XhtmlCodeType object) {
-				return createXhtmlCodeTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlColgroupType(XhtmlColgroupType object) {
-				return createXhtmlColgroupTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlColType(XhtmlColType object) {
-				return createXhtmlColTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlDdType(XhtmlDdType object) {
-				return createXhtmlDdTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlDfnType(XhtmlDfnType object) {
-				return createXhtmlDfnTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlDivType(XhtmlDivType object) {
-				return createXhtmlDivTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlDlType(XhtmlDlType object) {
-				return createXhtmlDlTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlDtType(XhtmlDtType object) {
-				return createXhtmlDtTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlEditType(XhtmlEditType object) {
-				return createXhtmlEditTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlEmType(XhtmlEmType object) {
-				return createXhtmlEmTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlH1Type(XhtmlH1Type object) {
-				return createXhtmlH1TypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlH2Type(XhtmlH2Type object) {
-				return createXhtmlH2TypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlH3Type(XhtmlH3Type object) {
-				return createXhtmlH3TypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlH4Type(XhtmlH4Type object) {
-				return createXhtmlH4TypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlH5Type(XhtmlH5Type object) {
-				return createXhtmlH5TypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlH6Type(XhtmlH6Type object) {
-				return createXhtmlH6TypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlHeadingType(XhtmlHeadingType object) {
-				return createXhtmlHeadingTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlHrType(XhtmlHrType object) {
-				return createXhtmlHrTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlInlPresType(XhtmlInlPresType object) {
-				return createXhtmlInlPresTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlKbdType(XhtmlKbdType object) {
-				return createXhtmlKbdTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlLiType(XhtmlLiType object) {
-				return createXhtmlLiTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlObjectType(XhtmlObjectType object) {
-				return createXhtmlObjectTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlOlType(XhtmlOlType object) {
-				return createXhtmlOlTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlParamType(XhtmlParamType object) {
-				return createXhtmlParamTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlPreType(XhtmlPreType object) {
-				return createXhtmlPreTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlPType(XhtmlPType object) {
-				return createXhtmlPTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlQType(XhtmlQType object) {
-				return createXhtmlQTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlSampType(XhtmlSampType object) {
-				return createXhtmlSampTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlSpanType(XhtmlSpanType object) {
-				return createXhtmlSpanTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlStrongType(XhtmlStrongType object) {
-				return createXhtmlStrongTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlTableType(XhtmlTableType object) {
-				return createXhtmlTableTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlTbodyType(XhtmlTbodyType object) {
-				return createXhtmlTbodyTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlTdType(XhtmlTdType object) {
-				return createXhtmlTdTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlTfootType(XhtmlTfootType object) {
-				return createXhtmlTfootTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlTheadType(XhtmlTheadType object) {
-				return createXhtmlTheadTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlThType(XhtmlThType object) {
-				return createXhtmlThTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlTrType(XhtmlTrType object) {
-				return createXhtmlTrTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlUlType(XhtmlUlType object) {
-				return createXhtmlUlTypeAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlVarType(XhtmlVarType object) {
-				return createXhtmlVarTypeAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected XhtmlSwitch<Adapter> modelSwitch = new XhtmlSwitch<Adapter>() {
+		@Override
+		public Adapter caseDocumentRoot(DocumentRoot object) {
+			return createDocumentRootAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlAbbrType(XhtmlAbbrType object) {
+			return createXhtmlAbbrTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlAcronymType(XhtmlAcronymType object) {
+			return createXhtmlAcronymTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlAddressType(XhtmlAddressType object) {
+			return createXhtmlAddressTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlAType(XhtmlAType object) {
+			return createXhtmlATypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlBlockquoteType(XhtmlBlockquoteType object) {
+			return createXhtmlBlockquoteTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlBrType(XhtmlBrType object) {
+			return createXhtmlBrTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlCaptionType(XhtmlCaptionType object) {
+			return createXhtmlCaptionTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlCiteType(XhtmlCiteType object) {
+			return createXhtmlCiteTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlCodeType(XhtmlCodeType object) {
+			return createXhtmlCodeTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlColgroupType(XhtmlColgroupType object) {
+			return createXhtmlColgroupTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlColType(XhtmlColType object) {
+			return createXhtmlColTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlDdType(XhtmlDdType object) {
+			return createXhtmlDdTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlDfnType(XhtmlDfnType object) {
+			return createXhtmlDfnTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlDivType(XhtmlDivType object) {
+			return createXhtmlDivTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlDlType(XhtmlDlType object) {
+			return createXhtmlDlTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlDtType(XhtmlDtType object) {
+			return createXhtmlDtTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlEditType(XhtmlEditType object) {
+			return createXhtmlEditTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlEmType(XhtmlEmType object) {
+			return createXhtmlEmTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlH1Type(XhtmlH1Type object) {
+			return createXhtmlH1TypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlH2Type(XhtmlH2Type object) {
+			return createXhtmlH2TypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlH3Type(XhtmlH3Type object) {
+			return createXhtmlH3TypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlH4Type(XhtmlH4Type object) {
+			return createXhtmlH4TypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlH5Type(XhtmlH5Type object) {
+			return createXhtmlH5TypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlH6Type(XhtmlH6Type object) {
+			return createXhtmlH6TypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlHeadingType(XhtmlHeadingType object) {
+			return createXhtmlHeadingTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlHrType(XhtmlHrType object) {
+			return createXhtmlHrTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlInlPresType(XhtmlInlPresType object) {
+			return createXhtmlInlPresTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlKbdType(XhtmlKbdType object) {
+			return createXhtmlKbdTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlLiType(XhtmlLiType object) {
+			return createXhtmlLiTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlObjectType(XhtmlObjectType object) {
+			return createXhtmlObjectTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlOlType(XhtmlOlType object) {
+			return createXhtmlOlTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlParamType(XhtmlParamType object) {
+			return createXhtmlParamTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlPreType(XhtmlPreType object) {
+			return createXhtmlPreTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlPType(XhtmlPType object) {
+			return createXhtmlPTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlQType(XhtmlQType object) {
+			return createXhtmlQTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlSampType(XhtmlSampType object) {
+			return createXhtmlSampTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlSpanType(XhtmlSpanType object) {
+			return createXhtmlSpanTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlStrongType(XhtmlStrongType object) {
+			return createXhtmlStrongTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlTableType(XhtmlTableType object) {
+			return createXhtmlTableTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlTbodyType(XhtmlTbodyType object) {
+			return createXhtmlTbodyTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlTdType(XhtmlTdType object) {
+			return createXhtmlTdTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlTfootType(XhtmlTfootType object) {
+			return createXhtmlTfootTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlTheadType(XhtmlTheadType object) {
+			return createXhtmlTheadTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlThType(XhtmlThType object) {
+			return createXhtmlThTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlTrType(XhtmlTrType object) {
+			return createXhtmlTrTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlUlType(XhtmlUlType object) {
+			return createXhtmlUlTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlVarType(XhtmlVarType object) {
+			return createXhtmlVarTypeAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param target
+	 *            the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
 	@Override
 	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
+		return modelSwitch.doSwitch((EObject) target);
 	}
 
-
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot <em>Document Root</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.DocumentRoot
+	 * <em>Document Root</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.DocumentRoot
 	 * @generated
@@ -303,11 +390,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType <em>Abbr Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType
+	 * <em>Abbr Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType
 	 * @generated
@@ -317,11 +404,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType <em>Acronym Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType
+	 * <em>Acronym Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType
 	 * @generated
@@ -331,11 +418,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType <em>Address Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType
+	 * <em>Address Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType
 	 * @generated
@@ -346,10 +433,9 @@
 
 	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlAType <em>AType</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful
+	 * to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlAType
 	 * @generated
@@ -359,11 +445,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType <em>Blockquote Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType
+	 * <em>Blockquote Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType
 	 * @generated
@@ -373,11 +459,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType <em>Br Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlBrType <em>Br Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlBrType
 	 * @generated
@@ -387,11 +472,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType <em>Caption Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType
+	 * <em>Caption Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType
 	 * @generated
@@ -401,11 +486,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType <em>Cite Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType
+	 * <em>Cite Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType
 	 * @generated
@@ -415,11 +500,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType <em>Code Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType
+	 * <em>Code Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType
 	 * @generated
@@ -429,11 +514,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType <em>Colgroup Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType
+	 * <em>Colgroup Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType
 	 * @generated
@@ -443,11 +528,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType <em>Col Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlColType
+	 * <em>Col Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlColType
 	 * @generated
@@ -457,11 +542,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType <em>Dd Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDdType <em>Dd Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDdType
 	 * @generated
@@ -471,11 +555,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType <em>Dfn Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType
+	 * <em>Dfn Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType
 	 * @generated
@@ -485,11 +569,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType <em>Div Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDivType
+	 * <em>Div Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDivType
 	 * @generated
@@ -499,11 +583,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType <em>Dl Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDlType <em>Dl Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDlType
 	 * @generated
@@ -513,11 +596,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType <em>Dt Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlDtType <em>Dt Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlDtType
 	 * @generated
@@ -527,11 +609,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType <em>Edit Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEditType
+	 * <em>Edit Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEditType
 	 * @generated
@@ -541,11 +623,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType <em>Em Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlEmType <em>Em Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlEmType
 	 * @generated
@@ -555,11 +636,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type <em>H1 Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type <em>H1 Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type
 	 * @generated
@@ -569,11 +649,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type <em>H2 Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type <em>H2 Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type
 	 * @generated
@@ -583,11 +662,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type <em>H3 Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type <em>H3 Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type
 	 * @generated
@@ -597,11 +675,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type <em>H4 Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type <em>H4 Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type
 	 * @generated
@@ -611,11 +688,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type <em>H5 Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type <em>H5 Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type
 	 * @generated
@@ -625,11 +701,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type <em>H6 Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type <em>H6 Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type
 	 * @generated
@@ -639,11 +714,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType <em>Heading Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType
+	 * <em>Heading Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType
 	 * @generated
@@ -653,11 +728,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType <em>Hr Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlHrType <em>Hr Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlHrType
 	 * @generated
@@ -667,11 +741,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType <em>Inl Pres Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType
+	 * <em>Inl Pres Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType
 	 * @generated
@@ -681,11 +755,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType <em>Kbd Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType
+	 * <em>Kbd Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType
 	 * @generated
@@ -695,11 +769,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType <em>Li Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlLiType <em>Li Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlLiType
 	 * @generated
@@ -709,11 +782,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType <em>Object Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType
+	 * <em>Object Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType
 	 * @generated
@@ -723,11 +796,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType <em>Ol Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlOlType <em>Ol Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlOlType
 	 * @generated
@@ -737,11 +809,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType <em>Param Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlParamType
+	 * <em>Param Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlParamType
 	 * @generated
@@ -751,11 +823,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType <em>Pre Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPreType
+	 * <em>Pre Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPreType
 	 * @generated
@@ -766,10 +838,9 @@
 
 	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlPType <em>PType</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful
+	 * to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPType
 	 * @generated
@@ -780,10 +851,9 @@
 
 	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlQType <em>QType</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful
+	 * to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlQType
 	 * @generated
@@ -793,11 +863,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType <em>Samp Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSampType
+	 * <em>Samp Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSampType
 	 * @generated
@@ -807,11 +877,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType <em>Span Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType
+	 * <em>Span Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType
 	 * @generated
@@ -821,11 +891,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType <em>Strong Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType
+	 * <em>Strong Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType
 	 * @generated
@@ -835,11 +905,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType <em>Table Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTableType
+	 * <em>Table Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTableType
 	 * @generated
@@ -849,11 +919,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType <em>Tbody Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType
+	 * <em>Tbody Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType
 	 * @generated
@@ -863,11 +933,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType <em>Td Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTdType <em>Td Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTdType
 	 * @generated
@@ -877,11 +946,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType <em>Tfoot Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType
+	 * <em>Tfoot Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType
 	 * @generated
@@ -891,11 +960,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType <em>Thead Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType
+	 * <em>Thead Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType
 	 * @generated
@@ -905,11 +974,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType <em>Th Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlThType <em>Th Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlThType
 	 * @generated
@@ -919,11 +987,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType <em>Tr Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlTrType <em>Tr Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlTrType
 	 * @generated
@@ -933,11 +1000,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType <em>Ul Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlUlType <em>Ul Type</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlUlType
 	 * @generated
@@ -947,11 +1013,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType <em>Var Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.xhtml.XhtmlVarType
+	 * <em>Var Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.xhtml.XhtmlVarType
 	 * @generated
@@ -961,10 +1027,9 @@
 	}
 
 	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
+	 * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -972,4 +1037,4 @@
 		return null;
 	}
 
-} //XhtmlAdapterFactory
+} // XhtmlAdapterFactory
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlResourceFactoryImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlResourceFactoryImpl.java
index ffd2961..343d4bf 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlResourceFactoryImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,25 +12,20 @@
 package org.eclipse.rmf.reqif10.xhtml.util;
 
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
 import org.eclipse.emf.ecore.xmi.XMLResource;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the package. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.util.XhtmlResourceImpl
  * @generated
  */
 public class XhtmlResourceFactoryImpl extends ResourceFactoryImpl {
 	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the resource factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlResourceFactoryImpl() {
@@ -38,9 +33,8 @@
 	}
 
 	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the resource. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -58,4 +52,4 @@
 		return result;
 	}
 
-} //XhtmlResourceFactoryImpl
+} // XhtmlResourceFactoryImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlResourceImpl.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlResourceImpl.java
index a45b377..a5fd8f4 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlResourceImpl.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlResourceImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,26 +12,24 @@
 package org.eclipse.rmf.reqif10.xhtml.util;
 
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Resource </b> associated with the package. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.util.XhtmlResourceFactoryImpl
  * @generated
  */
 public class XhtmlResourceImpl extends XMLResourceImpl {
 	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * Creates an instance of the resource. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param uri
+	 *            the URI of the new resource.
 	 * @generated
 	 */
 	public XhtmlResourceImpl(URI uri) {
 		super(uri);
 	}
 
-} //XhtmlResourceImpl
+} // XhtmlResourceImpl
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlSwitch.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlSwitch.java
index 9a9b5c7..4102920 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlSwitch.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlSwitch.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,37 +13,77 @@
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.util.Switch;
-
-import org.eclipse.rmf.reqif10.xhtml.*;
+import org.eclipse.rmf.reqif10.xhtml.DocumentRoot;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlAType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlAbbrType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlAcronymType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlAddressType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlBlockquoteType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlBrType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlCaptionType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlCiteType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlCodeType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlColType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlColgroupType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlDdType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlDfnType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlDivType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlDlType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlDtType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlEditType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlEmType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH1Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH2Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH3Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH4Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH5Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlH6Type;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlHeadingType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlHrType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlInlPresType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlKbdType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlLiType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlObjectType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlOlType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlPType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlParamType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlPreType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlQType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlSampType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlSpanType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlStrongType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTableType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTbodyType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTdType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTfootType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlThType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTheadType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlTrType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlUlType;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlVarType;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
+ * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
+ * returned, which is the result of the switch. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.xhtml.XhtmlPackage
  * @generated
  */
 public class XhtmlSwitch<T> extends Switch<T> {
 	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static XhtmlPackage modelPackage;
 
 	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlSwitch() {
@@ -53,9 +93,8 @@
 	}
 
 	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Checks whether this is a switch for the given package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -66,314 +105,362 @@
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that
+	 * result. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-			case XhtmlPackage.DOCUMENT_ROOT: {
-				DocumentRoot documentRoot = (DocumentRoot)theEObject;
-				T result = caseDocumentRoot(documentRoot);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_ABBR_TYPE: {
-				XhtmlAbbrType xhtmlAbbrType = (XhtmlAbbrType)theEObject;
-				T result = caseXhtmlAbbrType(xhtmlAbbrType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_ACRONYM_TYPE: {
-				XhtmlAcronymType xhtmlAcronymType = (XhtmlAcronymType)theEObject;
-				T result = caseXhtmlAcronymType(xhtmlAcronymType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_ADDRESS_TYPE: {
-				XhtmlAddressType xhtmlAddressType = (XhtmlAddressType)theEObject;
-				T result = caseXhtmlAddressType(xhtmlAddressType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_ATYPE: {
-				XhtmlAType xhtmlAType = (XhtmlAType)theEObject;
-				T result = caseXhtmlAType(xhtmlAType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE: {
-				XhtmlBlockquoteType xhtmlBlockquoteType = (XhtmlBlockquoteType)theEObject;
-				T result = caseXhtmlBlockquoteType(xhtmlBlockquoteType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_BR_TYPE: {
-				XhtmlBrType xhtmlBrType = (XhtmlBrType)theEObject;
-				T result = caseXhtmlBrType(xhtmlBrType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_CAPTION_TYPE: {
-				XhtmlCaptionType xhtmlCaptionType = (XhtmlCaptionType)theEObject;
-				T result = caseXhtmlCaptionType(xhtmlCaptionType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_CITE_TYPE: {
-				XhtmlCiteType xhtmlCiteType = (XhtmlCiteType)theEObject;
-				T result = caseXhtmlCiteType(xhtmlCiteType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_CODE_TYPE: {
-				XhtmlCodeType xhtmlCodeType = (XhtmlCodeType)theEObject;
-				T result = caseXhtmlCodeType(xhtmlCodeType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_COLGROUP_TYPE: {
-				XhtmlColgroupType xhtmlColgroupType = (XhtmlColgroupType)theEObject;
-				T result = caseXhtmlColgroupType(xhtmlColgroupType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_COL_TYPE: {
-				XhtmlColType xhtmlColType = (XhtmlColType)theEObject;
-				T result = caseXhtmlColType(xhtmlColType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_DD_TYPE: {
-				XhtmlDdType xhtmlDdType = (XhtmlDdType)theEObject;
-				T result = caseXhtmlDdType(xhtmlDdType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_DFN_TYPE: {
-				XhtmlDfnType xhtmlDfnType = (XhtmlDfnType)theEObject;
-				T result = caseXhtmlDfnType(xhtmlDfnType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_DIV_TYPE: {
-				XhtmlDivType xhtmlDivType = (XhtmlDivType)theEObject;
-				T result = caseXhtmlDivType(xhtmlDivType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_DL_TYPE: {
-				XhtmlDlType xhtmlDlType = (XhtmlDlType)theEObject;
-				T result = caseXhtmlDlType(xhtmlDlType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_DT_TYPE: {
-				XhtmlDtType xhtmlDtType = (XhtmlDtType)theEObject;
-				T result = caseXhtmlDtType(xhtmlDtType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_EDIT_TYPE: {
-				XhtmlEditType xhtmlEditType = (XhtmlEditType)theEObject;
-				T result = caseXhtmlEditType(xhtmlEditType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_EM_TYPE: {
-				XhtmlEmType xhtmlEmType = (XhtmlEmType)theEObject;
-				T result = caseXhtmlEmType(xhtmlEmType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_H1_TYPE: {
-				XhtmlH1Type xhtmlH1Type = (XhtmlH1Type)theEObject;
-				T result = caseXhtmlH1Type(xhtmlH1Type);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_H2_TYPE: {
-				XhtmlH2Type xhtmlH2Type = (XhtmlH2Type)theEObject;
-				T result = caseXhtmlH2Type(xhtmlH2Type);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_H3_TYPE: {
-				XhtmlH3Type xhtmlH3Type = (XhtmlH3Type)theEObject;
-				T result = caseXhtmlH3Type(xhtmlH3Type);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_H4_TYPE: {
-				XhtmlH4Type xhtmlH4Type = (XhtmlH4Type)theEObject;
-				T result = caseXhtmlH4Type(xhtmlH4Type);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_H5_TYPE: {
-				XhtmlH5Type xhtmlH5Type = (XhtmlH5Type)theEObject;
-				T result = caseXhtmlH5Type(xhtmlH5Type);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_H6_TYPE: {
-				XhtmlH6Type xhtmlH6Type = (XhtmlH6Type)theEObject;
-				T result = caseXhtmlH6Type(xhtmlH6Type);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_HEADING_TYPE: {
-				XhtmlHeadingType xhtmlHeadingType = (XhtmlHeadingType)theEObject;
-				T result = caseXhtmlHeadingType(xhtmlHeadingType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_HR_TYPE: {
-				XhtmlHrType xhtmlHrType = (XhtmlHrType)theEObject;
-				T result = caseXhtmlHrType(xhtmlHrType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_INL_PRES_TYPE: {
-				XhtmlInlPresType xhtmlInlPresType = (XhtmlInlPresType)theEObject;
-				T result = caseXhtmlInlPresType(xhtmlInlPresType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_KBD_TYPE: {
-				XhtmlKbdType xhtmlKbdType = (XhtmlKbdType)theEObject;
-				T result = caseXhtmlKbdType(xhtmlKbdType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_LI_TYPE: {
-				XhtmlLiType xhtmlLiType = (XhtmlLiType)theEObject;
-				T result = caseXhtmlLiType(xhtmlLiType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_OBJECT_TYPE: {
-				XhtmlObjectType xhtmlObjectType = (XhtmlObjectType)theEObject;
-				T result = caseXhtmlObjectType(xhtmlObjectType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_OL_TYPE: {
-				XhtmlOlType xhtmlOlType = (XhtmlOlType)theEObject;
-				T result = caseXhtmlOlType(xhtmlOlType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_PARAM_TYPE: {
-				XhtmlParamType xhtmlParamType = (XhtmlParamType)theEObject;
-				T result = caseXhtmlParamType(xhtmlParamType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_PRE_TYPE: {
-				XhtmlPreType xhtmlPreType = (XhtmlPreType)theEObject;
-				T result = caseXhtmlPreType(xhtmlPreType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_PTYPE: {
-				XhtmlPType xhtmlPType = (XhtmlPType)theEObject;
-				T result = caseXhtmlPType(xhtmlPType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_QTYPE: {
-				XhtmlQType xhtmlQType = (XhtmlQType)theEObject;
-				T result = caseXhtmlQType(xhtmlQType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_SAMP_TYPE: {
-				XhtmlSampType xhtmlSampType = (XhtmlSampType)theEObject;
-				T result = caseXhtmlSampType(xhtmlSampType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_SPAN_TYPE: {
-				XhtmlSpanType xhtmlSpanType = (XhtmlSpanType)theEObject;
-				T result = caseXhtmlSpanType(xhtmlSpanType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_STRONG_TYPE: {
-				XhtmlStrongType xhtmlStrongType = (XhtmlStrongType)theEObject;
-				T result = caseXhtmlStrongType(xhtmlStrongType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_TABLE_TYPE: {
-				XhtmlTableType xhtmlTableType = (XhtmlTableType)theEObject;
-				T result = caseXhtmlTableType(xhtmlTableType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_TBODY_TYPE: {
-				XhtmlTbodyType xhtmlTbodyType = (XhtmlTbodyType)theEObject;
-				T result = caseXhtmlTbodyType(xhtmlTbodyType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_TD_TYPE: {
-				XhtmlTdType xhtmlTdType = (XhtmlTdType)theEObject;
-				T result = caseXhtmlTdType(xhtmlTdType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_TFOOT_TYPE: {
-				XhtmlTfootType xhtmlTfootType = (XhtmlTfootType)theEObject;
-				T result = caseXhtmlTfootType(xhtmlTfootType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_THEAD_TYPE: {
-				XhtmlTheadType xhtmlTheadType = (XhtmlTheadType)theEObject;
-				T result = caseXhtmlTheadType(xhtmlTheadType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_TH_TYPE: {
-				XhtmlThType xhtmlThType = (XhtmlThType)theEObject;
-				T result = caseXhtmlThType(xhtmlThType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_TR_TYPE: {
-				XhtmlTrType xhtmlTrType = (XhtmlTrType)theEObject;
-				T result = caseXhtmlTrType(xhtmlTrType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_UL_TYPE: {
-				XhtmlUlType xhtmlUlType = (XhtmlUlType)theEObject;
-				T result = caseXhtmlUlType(xhtmlUlType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case XhtmlPackage.XHTML_VAR_TYPE: {
-				XhtmlVarType xhtmlVarType = (XhtmlVarType)theEObject;
-				T result = caseXhtmlVarType(xhtmlVarType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		case XhtmlPackage.DOCUMENT_ROOT: {
+			DocumentRoot documentRoot = (DocumentRoot) theEObject;
+			T result = caseDocumentRoot(documentRoot);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_ABBR_TYPE: {
+			XhtmlAbbrType xhtmlAbbrType = (XhtmlAbbrType) theEObject;
+			T result = caseXhtmlAbbrType(xhtmlAbbrType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_ACRONYM_TYPE: {
+			XhtmlAcronymType xhtmlAcronymType = (XhtmlAcronymType) theEObject;
+			T result = caseXhtmlAcronymType(xhtmlAcronymType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_ADDRESS_TYPE: {
+			XhtmlAddressType xhtmlAddressType = (XhtmlAddressType) theEObject;
+			T result = caseXhtmlAddressType(xhtmlAddressType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_ATYPE: {
+			XhtmlAType xhtmlAType = (XhtmlAType) theEObject;
+			T result = caseXhtmlAType(xhtmlAType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_BLOCKQUOTE_TYPE: {
+			XhtmlBlockquoteType xhtmlBlockquoteType = (XhtmlBlockquoteType) theEObject;
+			T result = caseXhtmlBlockquoteType(xhtmlBlockquoteType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_BR_TYPE: {
+			XhtmlBrType xhtmlBrType = (XhtmlBrType) theEObject;
+			T result = caseXhtmlBrType(xhtmlBrType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_CAPTION_TYPE: {
+			XhtmlCaptionType xhtmlCaptionType = (XhtmlCaptionType) theEObject;
+			T result = caseXhtmlCaptionType(xhtmlCaptionType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_CITE_TYPE: {
+			XhtmlCiteType xhtmlCiteType = (XhtmlCiteType) theEObject;
+			T result = caseXhtmlCiteType(xhtmlCiteType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_CODE_TYPE: {
+			XhtmlCodeType xhtmlCodeType = (XhtmlCodeType) theEObject;
+			T result = caseXhtmlCodeType(xhtmlCodeType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_COLGROUP_TYPE: {
+			XhtmlColgroupType xhtmlColgroupType = (XhtmlColgroupType) theEObject;
+			T result = caseXhtmlColgroupType(xhtmlColgroupType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_COL_TYPE: {
+			XhtmlColType xhtmlColType = (XhtmlColType) theEObject;
+			T result = caseXhtmlColType(xhtmlColType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_DD_TYPE: {
+			XhtmlDdType xhtmlDdType = (XhtmlDdType) theEObject;
+			T result = caseXhtmlDdType(xhtmlDdType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_DFN_TYPE: {
+			XhtmlDfnType xhtmlDfnType = (XhtmlDfnType) theEObject;
+			T result = caseXhtmlDfnType(xhtmlDfnType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_DIV_TYPE: {
+			XhtmlDivType xhtmlDivType = (XhtmlDivType) theEObject;
+			T result = caseXhtmlDivType(xhtmlDivType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_DL_TYPE: {
+			XhtmlDlType xhtmlDlType = (XhtmlDlType) theEObject;
+			T result = caseXhtmlDlType(xhtmlDlType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_DT_TYPE: {
+			XhtmlDtType xhtmlDtType = (XhtmlDtType) theEObject;
+			T result = caseXhtmlDtType(xhtmlDtType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_EDIT_TYPE: {
+			XhtmlEditType xhtmlEditType = (XhtmlEditType) theEObject;
+			T result = caseXhtmlEditType(xhtmlEditType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_EM_TYPE: {
+			XhtmlEmType xhtmlEmType = (XhtmlEmType) theEObject;
+			T result = caseXhtmlEmType(xhtmlEmType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_H1_TYPE: {
+			XhtmlH1Type xhtmlH1Type = (XhtmlH1Type) theEObject;
+			T result = caseXhtmlH1Type(xhtmlH1Type);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_H2_TYPE: {
+			XhtmlH2Type xhtmlH2Type = (XhtmlH2Type) theEObject;
+			T result = caseXhtmlH2Type(xhtmlH2Type);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_H3_TYPE: {
+			XhtmlH3Type xhtmlH3Type = (XhtmlH3Type) theEObject;
+			T result = caseXhtmlH3Type(xhtmlH3Type);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_H4_TYPE: {
+			XhtmlH4Type xhtmlH4Type = (XhtmlH4Type) theEObject;
+			T result = caseXhtmlH4Type(xhtmlH4Type);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_H5_TYPE: {
+			XhtmlH5Type xhtmlH5Type = (XhtmlH5Type) theEObject;
+			T result = caseXhtmlH5Type(xhtmlH5Type);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_H6_TYPE: {
+			XhtmlH6Type xhtmlH6Type = (XhtmlH6Type) theEObject;
+			T result = caseXhtmlH6Type(xhtmlH6Type);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_HEADING_TYPE: {
+			XhtmlHeadingType xhtmlHeadingType = (XhtmlHeadingType) theEObject;
+			T result = caseXhtmlHeadingType(xhtmlHeadingType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_HR_TYPE: {
+			XhtmlHrType xhtmlHrType = (XhtmlHrType) theEObject;
+			T result = caseXhtmlHrType(xhtmlHrType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_INL_PRES_TYPE: {
+			XhtmlInlPresType xhtmlInlPresType = (XhtmlInlPresType) theEObject;
+			T result = caseXhtmlInlPresType(xhtmlInlPresType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_KBD_TYPE: {
+			XhtmlKbdType xhtmlKbdType = (XhtmlKbdType) theEObject;
+			T result = caseXhtmlKbdType(xhtmlKbdType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_LI_TYPE: {
+			XhtmlLiType xhtmlLiType = (XhtmlLiType) theEObject;
+			T result = caseXhtmlLiType(xhtmlLiType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_OBJECT_TYPE: {
+			XhtmlObjectType xhtmlObjectType = (XhtmlObjectType) theEObject;
+			T result = caseXhtmlObjectType(xhtmlObjectType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_OL_TYPE: {
+			XhtmlOlType xhtmlOlType = (XhtmlOlType) theEObject;
+			T result = caseXhtmlOlType(xhtmlOlType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_PARAM_TYPE: {
+			XhtmlParamType xhtmlParamType = (XhtmlParamType) theEObject;
+			T result = caseXhtmlParamType(xhtmlParamType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_PRE_TYPE: {
+			XhtmlPreType xhtmlPreType = (XhtmlPreType) theEObject;
+			T result = caseXhtmlPreType(xhtmlPreType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_PTYPE: {
+			XhtmlPType xhtmlPType = (XhtmlPType) theEObject;
+			T result = caseXhtmlPType(xhtmlPType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_QTYPE: {
+			XhtmlQType xhtmlQType = (XhtmlQType) theEObject;
+			T result = caseXhtmlQType(xhtmlQType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_SAMP_TYPE: {
+			XhtmlSampType xhtmlSampType = (XhtmlSampType) theEObject;
+			T result = caseXhtmlSampType(xhtmlSampType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_SPAN_TYPE: {
+			XhtmlSpanType xhtmlSpanType = (XhtmlSpanType) theEObject;
+			T result = caseXhtmlSpanType(xhtmlSpanType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_STRONG_TYPE: {
+			XhtmlStrongType xhtmlStrongType = (XhtmlStrongType) theEObject;
+			T result = caseXhtmlStrongType(xhtmlStrongType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_TABLE_TYPE: {
+			XhtmlTableType xhtmlTableType = (XhtmlTableType) theEObject;
+			T result = caseXhtmlTableType(xhtmlTableType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_TBODY_TYPE: {
+			XhtmlTbodyType xhtmlTbodyType = (XhtmlTbodyType) theEObject;
+			T result = caseXhtmlTbodyType(xhtmlTbodyType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_TD_TYPE: {
+			XhtmlTdType xhtmlTdType = (XhtmlTdType) theEObject;
+			T result = caseXhtmlTdType(xhtmlTdType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_TFOOT_TYPE: {
+			XhtmlTfootType xhtmlTfootType = (XhtmlTfootType) theEObject;
+			T result = caseXhtmlTfootType(xhtmlTfootType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_THEAD_TYPE: {
+			XhtmlTheadType xhtmlTheadType = (XhtmlTheadType) theEObject;
+			T result = caseXhtmlTheadType(xhtmlTheadType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_TH_TYPE: {
+			XhtmlThType xhtmlThType = (XhtmlThType) theEObject;
+			T result = caseXhtmlThType(xhtmlThType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_TR_TYPE: {
+			XhtmlTrType xhtmlTrType = (XhtmlTrType) theEObject;
+			T result = caseXhtmlTrType(xhtmlTrType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_UL_TYPE: {
+			XhtmlUlType xhtmlUlType = (XhtmlUlType) theEObject;
+			T result = caseXhtmlUlType(xhtmlUlType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case XhtmlPackage.XHTML_VAR_TYPE: {
+			XhtmlVarType xhtmlVarType = (XhtmlVarType) theEObject;
+			T result = caseXhtmlVarType(xhtmlVarType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Document Root</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Document Root</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Document Root</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -383,12 +470,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Abbr Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Abbr Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Abbr Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -398,12 +484,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Acronym Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Acronym Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Acronym Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -413,12 +498,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Address Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Address Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Address Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -428,12 +512,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>AType</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>AType</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>AType</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -443,12 +526,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Blockquote Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Blockquote Type</em>'. <!-- begin-user-doc
+	 * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Blockquote Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -458,12 +541,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Br Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Br Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Br Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -473,12 +555,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Caption Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Caption Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Caption Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -488,12 +569,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Cite Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Cite Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Cite Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -503,12 +583,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Code Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Code Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Code Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -518,12 +597,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Colgroup Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Colgroup Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Colgroup Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -533,12 +611,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Col Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Col Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Col Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -548,12 +625,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Dd Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Dd Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Dd Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -563,12 +639,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Dfn Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Dfn Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Dfn Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -578,12 +653,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Div Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Div Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Div Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -593,12 +667,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Dl Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Dl Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Dl Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -608,12 +681,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Dt Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Dt Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Dt Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -623,12 +695,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Edit Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Edit Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Edit Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -638,12 +709,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Em Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Em Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Em Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -653,12 +723,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>H1 Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>H1 Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>H1 Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -668,12 +737,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>H2 Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>H2 Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>H2 Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -683,12 +751,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>H3 Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>H3 Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>H3 Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -698,12 +765,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>H4 Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>H4 Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>H4 Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -713,12 +779,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>H5 Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>H5 Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>H5 Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -728,12 +793,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>H6 Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>H6 Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>H6 Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -743,12 +807,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Heading Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Heading Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Heading Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -758,12 +821,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Hr Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Hr Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Hr Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -773,12 +835,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Inl Pres Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Inl Pres Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Inl Pres Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -788,12 +849,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Kbd Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Kbd Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Kbd Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -803,12 +863,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Li Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Li Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Li Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -818,12 +877,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Object Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Object Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Object Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -833,12 +891,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ol Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Ol Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Ol Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -848,12 +905,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Param Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Param Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Param Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -863,12 +919,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Pre Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Pre Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Pre Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -878,12 +933,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>PType</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>PType</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>PType</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -893,12 +947,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>QType</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>QType</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>QType</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -908,12 +961,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Samp Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Samp Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Samp Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -923,12 +975,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Span Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Span Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Span Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -938,12 +989,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Strong Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Strong Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Strong Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -953,12 +1003,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Table Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Table Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Table Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -968,12 +1017,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Tbody Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Tbody Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Tbody Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -983,12 +1031,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Td Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Td Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Td Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -998,12 +1045,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Tfoot Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Tfoot Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Tfoot Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1013,12 +1059,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Thead Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Thead Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Thead Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1028,12 +1073,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Th Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Th Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Th Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1043,12 +1087,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Tr Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Tr Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Tr Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1058,12 +1101,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ul Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Ul Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Ul Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1073,12 +1115,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Var Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Var Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Var Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1088,12 +1129,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
+	 * anyway. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -1103,4 +1144,4 @@
 		return null;
 	}
 
-} //XhtmlSwitch
+} // XhtmlSwitch
diff --git a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlXMLProcessor.java b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlXMLProcessor.java
index 4448ca1..9af32b0 100644
--- a/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlXMLProcessor.java
+++ b/org.eclipse.rmf.reqif10.xhtml/src/org/eclipse/rmf/reqif10/xhtml/util/XhtmlXMLProcessor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,36 +14,32 @@
 import java.util.Map;
 
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This class contains helper methods to serialize and deserialize XML documents <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class XhtmlXMLProcessor extends XMLProcessor {
 
 	/**
-	 * Public constructor to instantiate the helper.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Public constructor to instantiate the helper. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		XhtmlPackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
-	 * Register for "*" and "xml" file extensions the XhtmlResourceFactoryImpl factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Register for "*" and "xml" file extensions the XhtmlResourceFactoryImpl factory. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -56,4 +52,4 @@
 		return registrations;
 	}
 
-} //XhtmlXMLProcessor
+} // XhtmlXMLProcessor
diff --git a/org.eclipse.rmf.reqif10/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10/META-INF/MANIFEST.MF
index 055c02c..0cb2af4 100644
--- a/org.eclipse.rmf.reqif10/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10/META-INF/MANIFEST.MF
@@ -2,15 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rmf.reqif10;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.rmf.reqif10,
- org.eclipse.rmf.reqif10.impl,
- org.eclipse.rmf.reqif10.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi;visibility:=reexport
+Export-Package: org.eclipse.rmf.reqif10,org.eclipse.rmf.reqif10.impl,o
+ rg.eclipse.rmf.reqif10.util
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.emf.ecore;bundle-version="2.7.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.7.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.rmf.reqif10/about.html b/org.eclipse.rmf.reqif10/about.html
index f47dbdd..87e6955 100644
--- a/org.eclipse.rmf.reqif10/about.html
+++ b/org.eclipse.rmf.reqif10/about.html
@@ -1,28 +1,172 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>February 17, 2014</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+		
+<h3>Third Party Content</h3>
+<p>The Content includes items that have been sourced from third parties as set out below. If you 
+did not receive this Content directly from the Eclipse Foundation, the following is provided 
+for informational purposes only, and you should look to the Redistributor's license for 
+terms and conditions of use.</p>
+
+<h4>OMG ReqIF XML Schema</h4>
+
+<p>The plug-in is accompanied by the OMG ReqIF XML Schema files. The OMG ReqIF specification is available at: <a
+	href="http://www.omg.org/spec/ReqIF/">http://www.omg.org/spec/ReqIF/</a>.
+</p>
+	
+The following OMG ReqIF XML Schema files are located in the plug-in:
+<p>
+<ul>
+	<li><strong>schema/reqif.xsd</strong> obtained from <a
+		href="http://www.omg.org/spec/ReqIF/20110401/reqif.xsd" 
+		target="_blank">http://www.omg.org/spec/ReqIF/20110401/reqif.xsd</a></li>
+	<li><strong>schema/driver.xsd</strong> obtained from <a
+		href="http://www.omg.org/spec/ReqIF/20110402/driver.xsd"
+		target="_blank">http://www.omg.org/spec/ReqIF/20110402/driver.xsd</a></li>
+</ul>
+
+<p>Your use of the OMG ReqIF XML Schema files is governed by the terms and conditions of the
+Object Management Group License a copy of which is included in the file <a
+	href="about_files/OMG_NoticeAndLicense.html">about_files/OMG_NoticeAndLicense.html</a>
+and is also available in the ReqIF specification <a
+	href="http://www.omg.org/spec/ReqIF/1.1/PDF"
+	target="_blank">http://www.omg.org/spec/ReqIF/1.1/PDF</a>.</p>
+
+		
+<h4>W3C XHTML Modularization Schemas (subset)</h4>
+
+<p>The plug-in is accompanied by a subset of the XHTML Modularization XML Schema files which are referenced by the OMG ReqIF XML schema. The XHTML Modularization specification is available at: <a
+	href="http://www.w3.org/TR/xhtml-modularization/">http://www.w3.org/TR/xhtml-modularization/</a>.
+</p>
+	
+The following XHTML Modularization Schema files are located in the plug-in:
+<p>
+<ul>
+	<li><strong>schema/xhtml-attribs-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-attribs-1.xsd" target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-attribs-1.xsd</a></li>
+	<li><strong>schema/xhtml-blkphras-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-blkphras-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-blkphras-1.xsd</a></li>
+	<li><strong>schema/xhtml-blkpres-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-blkpres-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-blkpres-1.xsd</a></li>
+	<li><strong>schema/xhtml-blkstruct-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-blkstruct-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-blkstruct-1.xsd</a></li>
+	<li><strong>schema/xhtml-datatypes-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-datatypes-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-datatypes-1.xsd</a></li>
+	<li><strong>schema/xhtml-edit-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-edit-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-edit-1.xsd</a></li>
+    <li><strong>schema/xhtml-framework-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-framework-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-framework-1.xsd</a></li>
+	<li><strong>schema/xhtml-hypertext-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-hypertext-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-hypertext-1.xsd</a></li>
+	<li><strong>schema/xhtml-inlphras-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlphras-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlphras-1.xsd</a></li>
+	<li><strong>schema/xhtml-inlpres-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlpres-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlpres-1.xsd</a></li>
+	<li><strong>schema/xhtml-inlstruct-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlstruct-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlstruct-1.xsd</a></li>
+	<li><strong>schema/xhtml-inlstyle-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlstyle-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlstyle-1.xsd</a></li>
+	<li><strong>schema/xhtml-list-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-list-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-list-1.xsd</a></li>
+	<li><strong>schema/xhtml-object-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-object-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-object-1.xsd</a></li>
+	<li><strong>schema/xhtml-param-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-param-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-param-1.xsd</a></li>
+	<li><strong>schema/xhtml-pres-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-pres-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-pres-1.xsd</a></li>
+	<li><strong>schema/xhtml-table-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-table-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-table-1.xsd</a></li>
+	<li><strong>schema/xhtml-text-1.xsd</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-text-1.xsd"
+		target="_blank">http://www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-text-1.xsd</a></li>
+		
+		
+	<!-- uncomment as soon as the entity definitions are pushed to git
+	<li><strong>schema/xhtml-lat1.ent</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent" target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent</a></li>
+	<li><strong>schema/xhtml-special.ent</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent"
+		target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent</a></li>
+	<li><strong>schema/xhtml-symbol.ent</strong> obtained from <a
+		href="http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent"
+		target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent</a></li>
+    -->
+</ul>
+
+<p>As described in the FAQ located at <a
+	href="http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html"
+	target="_blank">http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html</a>,
+your use of the W3C XHTML Schemas is governed by the terms and conditions of the
+W3C Software License a copy of which is included in the file <a
+	href="about_files/W3C_SoftwareNoticeAndLicense.html">about_files/W3C_SoftwareNoticeAndLicense.html</a>
+and is also available at <a
+	href="https://www.w3.org/Consortium/Legal/copyright-software"
+	target="_blank">https://www.w3.org/Consortium/Legal/copyright-software</a>.</p>
+	
+	
+<h4>W3C XML namespace Schema</h4>
+
+<p>The plug-in is accompanied by XML Namespace XML Schema file which are referenced by the OMG ReqIF Schemas and the W3C XHTML Modularization Schemas. The XML Namespace specification is available at: <a
+	href="http://www.w3.org/XML/1998/namespace.html">http://www.w3.org/XML/1998/namespace.html</a>.
+</p>
+	
+The following XML namespace XML Schema file is located in the plug-in:
+<p>
+<ul>
+	<li><strong>schema/xml.xsd</strong> obtained from <a
+		href="http://www.w3.org/2001/xml.xsd" 
+		target="_blank">http://www.w3.org/2001/xml.xsd</a></li>
+</ul>
+
+<p>As described in the FAQ located at <a
+	href="http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html"
+	target="_blank">http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html</a>,
+your use of the W3C namespace Schema is governed by the terms and conditions of the
+W3C Software License a copy of which is included in the file <a
+	href="about_files/W3C_SoftwareNoticeAndLicense.html">about_files/W3C_SoftwareNoticeAndLicense.html</a>
+and is also available at <a
+	href="https://www.w3.org/Consortium/Legal/copyright-software"
+	target="_blank">https://www.w3.org/Consortium/Legal/copyright-software</a>.</p>
+
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10/about.ini b/org.eclipse.rmf.reqif10/about.ini
new file mode 100644
index 0000000..8fe2c3a
--- /dev/null
+++ b/org.eclipse.rmf.reqif10/about.ini
@@ -0,0 +1,3 @@
+featureImage=rmfFeature.png

+appName=%featureName

+aboutText=%featureText

diff --git a/org.eclipse.rmf.reqif10/about.mappings b/org.eclipse.rmf.reqif10/about.mappings
new file mode 100644
index 0000000..87ee85b
--- /dev/null
+++ b/org.eclipse.rmf.reqif10/about.mappings
@@ -0,0 +1,4 @@
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
diff --git a/org.eclipse.rmf.reqif10/about.properties b/org.eclipse.rmf.reqif10/about.properties
new file mode 100644
index 0000000..9df1c58
--- /dev/null
+++ b/org.eclipse.rmf.reqif10/about.properties
@@ -0,0 +1,21 @@
+###############################################################################

+# Copyright (c) 2014 itemis AG and others.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     Mark Broerkens (itemis AG) - initial API and implementation

+###############################################################################

+featureName=RMF - Requirements Modeling Framework

+

+featureText=RMF - Requirements Modeling Framework\n\

+Version: {featureVersion}\n\

+Build id: {0}\n\

+\n\

+(c) Copyright Eclipse contributors and others. 2011, 2014.  All rights reserved.\n\

+\n\

+The Requirements Modeling Framework is an EMF-based implementation of the OMG ReqIf standard\n\

+Visit http://www.eclipse.org/rmf/

+    
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10/about_files/OMG_NoticeAndLicense.html b/org.eclipse.rmf.reqif10/about_files/OMG_NoticeAndLicense.html
new file mode 100644
index 0000000..26bf939
--- /dev/null
+++ b/org.eclipse.rmf.reqif10/about_files/OMG_NoticeAndLicense.html
@@ -0,0 +1,80 @@
+<html>
+<head>
+<title>OMG Notice and License</title>
+</head>
+
+<body>
+<h1>OMG Notice and License</h1>
+<h2>COPYRIGHTS</h2>
+<ul>
+<li>Copyright &copy; 2010, 88solutions Corporation </li>
+<li>Copyright &copy; 2010, Atego Systems GmbH  </li>
+<li>Copyright &copy; 2010, Audi AG </li>
+<li>Copyright &copy; 2010, BMW AG </li>
+<li>Copyright &copy; 2010, Continental AG </li>
+<li>Copyright &copy; 2010, Daimler AG </li>
+<li>Copyright &copy; 2010, HOOD GmbH </li>
+<li>Copyright &copy; 2010, International Business Machines  </li>
+<li>Copyright &copy; 2010, MKS GmbH </li>
+<li>Copyright &copy; 2010, ModelAlchemy Consulting  </li>
+<li>Copyright &copy; 2013, Object Management Group, Inc.  </li>
+<li>Copyright &copy; 2010, PROSTEP AG </li>
+<li>Copyright &copy; 2010, ProSTEP iViP Association  </li>
+<li>Copyright &copy; 2010, Robert Bosch GmbH </li>
+<li>Copyright &copy; 2010, Volkswagen AG </li>
+</ul>
+
+<h2>USE OF SPECIFICATION - TERMS, CONDITIONS & NOTICES</h2>
+<p>
+The material in this document details an Object Management Group specification in accordance with the terms, conditions and notices set forth below. This document does not represent a commitment to implement any portion of this specification in any company's products. The information contained in this document is subject to change without notice.
+</p>
+
+<h2>LICENSES</h2>
+<p>
+The companies listed above have granted to the Object Management Group, Inc. (OMG) a nonexclusive, royalty-free, paid up, worldwide license to copy and distribute this document and to modify this document and distribute copies of the modified version. Each of the copyright holders listed above has agreed that no person shall be deemed to have infringed the copyright in the included material of any such copyright holder by reason of having used the specification set forth herein or having conformed any computer software to the specification.
+</p>
+<p>
+Subject to all of the terms and conditions below, the owners of the copyright in this specification hereby grant you a fully-paid up, non-exclusive, nontransferable, perpetual, worldwide license (without the right to sublicense), to use this specification to create and distribute software and special purpose specifications that are based upon this specification, and to use, copy, and distribute this specification as provided under the Copyright Act; provided that:
+<ol>
+<li>both the copyright notice identified above and this permission notice appear on any copies of this specification; </li>
+<li>the use of the specifications is for informational purposes and will not be copied or posted on any network computer or broadcast in any media and will not be otherwise resold or transferred for commercial purposes; and </li>
+<li>no modifications are made to this specification. </li>
+</ol>
+This limited permission automatically terminates without notice if you breach any of these terms or conditions. Upon termination, you will destroy immediately any copies of the specifications in your possession or control.</p>
+
+<h2>PATENTS</h2>
+<p>
+The attention of adopters is directed to the possibility that compliance with or adoption of OMG specifications may require use of an invention covered by patent rights. OMG shall not be responsible for identifying patents for which a license may be required by any OMG specification, or for conducting legal inquiries into the legal validity or scope of those patents that are brought to its attention. OMG specifications are prospective and advisory only. Prospective users are responsible for protecting themselves against liability for infringement of patents.
+</p>
+
+<h2>GENERAL USE RESTRICTIONS</h2>
+<p>
+Any unauthorized use of this specification may violate copyright laws, trademark laws, and communications regulations and statutes. This document contains information which is protected by copyright. All Rights Reserved. No part of this work covered by copyright herein may be reproduced or used in any form or by any means--graphic, electronic, or mechanical, including photocopying, recording, taping, or information storage and retrieval systems--without permission of the copyright owner.
+</p>
+
+<h2>DISCLAIMER OF WARRANTY</h2>
+<p>
+WHILE THIS PUBLICATION IS BELIEVED TO BE ACCURATE, IT IS PROVIDED "AS IS" AND MAY CONTAIN ERRORS OR MISPRINTS. THE OBJECT MANAGEMENT GROUP AND THE COMPANIES LISTED ABOVE MAKE NO WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, WITH REGARD TO THIS PUBLICATION, INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF TITLE OR OWNERSHIP, IMPLIED WARRANTY OF MERCHANTABILITY OR WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE OR USE.
+IN NO EVENT SHALL THE OBJECT MANAGEMENT GROUP OR ANY OF THE COMPANIES LISTED ABOVE BE LIABLE FOR ERRORS CONTAINED HEREIN OR FOR DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL, RELIANCE OR COVER DAMAGES, INCLUDING LOSS OF PROFITS, REVENUE, DATA OR USE, INCURRED BY ANY USER OR ANY THIRD PARTY IN CONNECTION WITH THE FURNISHING, PERFORMANCE, OR USE OF THIS MATERIAL, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+</p>
+<p>
+The entire risk as to the quality and performance of software developed using this specification is borne by you. This disclaimer of warranty constitutes an essential part of the license granted to you to use this specification.
+</p>
+
+<h2>RESTRICTED RIGHTS LEGEND</h2>
+<p>
+Use, duplication or disclosure by the U.S. Government is subject to the restrictions set forth in subparagraph (c) (1) (ii) of The Rights in Technical Data and Computer Software Clause at DFARS 252.227-7013 or in subparagraph (c)(1) and (2) of the Commercial Computer Software - Restricted Rights clauses at 48 C.F.R. 52.227-19 or as specified in 48 C.F.R. 227-7202-2 of the DoD F.A.R. Supplement and its successors, or as specified in 48 C.F.R. 12.212 of the Federal Acquisition Regulations and its successors, as applicable. The specification copyright owners are as indicated above and may be contacted through the Object Management Group, 109 Highland Avenue, Needham, MA 02494, U.S.A.
+</p>
+
+<h2>TRADEMARKS</h2>
+<p>
+IMM&reg;, MDA&reg;, Model Driven Architecture&reg;, UML&reg;, UML Cube logo&reg;, OMG Logo&reg;, CORBA&reg; and XMI&reg; are registered trademarks of the Object Management Group, Inc., and Object Management Group&trade;, OMG&trade; , Unified Modeling Language&trade;, Model Driven Architecture Logo&trade;, Model Driven Architecture Diagram&trade;, CORBA logos&trade;, XMI Logo&trade;, CWM&trade;, CWM Logo&trade;, MOF&trade; ,MOF&trade; , OMG Interface Definition Language (IDL)&trade; , and OMG SysML&trade; are trademarks of the Object Management Group. All other products or company names mentioned are used for identification purposes only, and may be trademarks of their respective owners.
+</p>
+
+<h2>COMPLIANCE</h2>
+<p>
+The copyright holders listed above acknowledge that the Object Management Group (acting itself or through its designees) is and shall at all times be the sole entity that may authorize developers, suppliers and sellers of computer software to use certification marks, trademarks or other special designations to indicate compliance with these materials. Software developed under the terms of this license may claim compliance or conformance with this specification if and only if the software compliance is of a nature fully matching the applicable compliance points as stated in the specification. Software developed only partially matching the applicable compliance points may claim only that the software was based on this specification, but may not claim compliance or conformance with this specification. In the event that testing suites are implemented or approved by Object Management Group, Inc., software developed using this specification may claim compliance or conformance with the specification only if the software satisfactorily completes the testing suites.
+</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10/about_files/W3C_SoftwareNoticeAndLicense.html b/org.eclipse.rmf.reqif10/about_files/W3C_SoftwareNoticeAndLicense.html
new file mode 100644
index 0000000..2020990
--- /dev/null
+++ b/org.eclipse.rmf.reqif10/about_files/W3C_SoftwareNoticeAndLicense.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <title>W3C Software Notice and License</title>
+</head><body>
+    
+               <h1 class="title">W3C Software Notice and License</h1>
+                     <p>This work (and included software, documentation such as READMEs, or other
+related items) is being provided by the copyright holders under the following
+license.</p>
+<h2>License</h2>
+                     
+                     <p>
+By obtaining, using and/or copying this work, you (the licensee)
+agree that you have read, understood, and will comply with the following
+terms and conditions.</p>
+
+                     <p>Permission to copy, modify, and distribute this software and its
+documentation, with or without modification,&#xA0;for any purpose and without
+fee or royalty is hereby granted, provided that you include the following on
+ALL copies of the software and documentation or portions thereof, including
+modifications:</p>
+
+                     <ul><li>The full text of this NOTICE in a location viewable to users of the
+    redistributed or derivative work.</li><li>Any pre-existing intellectual property disclaimers, notices, or terms
+    and conditions. If none exist, the <a href="http://www.w3.org/Consortium/Legal/2002/copyright-software-short-notice-20021231.html">W3C Software Short
+    Notice</a> should be included (hypertext is preferred, text is permitted)
+    within the body of any redistributed or derivative code.</li><li>Notice of any changes or modifications to the files, including the date
+    changes were made. (We recommend you provide URIs to the location from
+    which the code is derived.)</li></ul>
+
+<h2>Disclaimers</h2>
+
+                     <p>THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
+MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
+PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
+ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
+
+                     <p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+DOCUMENTATION.</p>
+
+                     <p>The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to the software without specific, written
+prior permission. Title to copyright in this software and any associated
+documentation will at all times remain with copyright holders.</p>
+
+                     <h2>Notes</h2>
+
+	                    <p>This version: http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231</p>
+
+                     <p>This formulation of W3C's notice and license became active on December 31
+2002. This version removes the copyright ownership notice such that this
+license can be used with materials other than those owned by the W3C,
+reflects that ERCIM is now a host of the W3C, includes references to this
+specific dated version of the license, and removes the ambiguous grant of
+"use". Otherwise, this version is the same as the <a href="http://www.w3.org/Consortium/Legal/copyright-software-19980720">previous
+version</a> and is written so as to preserve the <a href="http://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses">Free
+Software Foundation's assessment of GPL compatibility</a> and <a href="http://www.opensource.org/licenses/W3C.php">OSI's certification</a>
+under the <a href="http://www.opensource.org/docs/definition.php">Open Source
+Definition</a>.</p>
+
+      
+                <p class="copyright">Copyright &#xA9; 2012 W3C <sup>&#xAE;</sup> (<a href="http://www.csail.mit.edu/">
+                  <acronym title="Massachusetts Institute of Technology">MIT</acronym>
+               </a>, <a href="http://www.ercim.org/">
+                  <acronym title="European Research Consortium for Informatics and Mathematics"> ERCIM</acronym>
+               </a>, <a href="http://www.keio.ac.jp/">Keio</a>, <a href="http://ev.buaa.edu.cn/">Beihang</a>) <a href="http://www.w3.org/Consortium/Legal/2002/ipr-notice-20021231">Usage policies apply</a>.</p>
+      
+     </body>
+</html>
diff --git a/org.eclipse.rmf.reqif10/build.properties b/org.eclipse.rmf.reqif10/build.properties
index c7dd581..0d6c860 100644
--- a/org.eclipse.rmf.reqif10/build.properties
+++ b/org.eclipse.rmf.reqif10/build.properties
@@ -1,18 +1,35 @@
-# Copyright (c) 2013 itemis AG.
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
-# 
+#
 # Contributors:
-#     Mark Broerkens - initial API and implementation
-# 
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
+
 
 bin.includes = .,\
                model/,\
                META-INF/,\
                plugin.xml,\
-               plugin.properties
+               plugin.properties,\
+               epl-v10.html,\
+               about.html,\
+               notice.html,\
+               about.ini,\
+               about.properties,\
+               rmfFeature.png,\
+               about.mappings,\
+               schema/,\
+               about_files/
 jars.compile.order = .
 source.. = src/
 output.. = bin/
+src.includes = model/,\
+               notice.html,\
+               epl-v10.html,\
+               about.html,\
+               schema/,\
+               pom.xml
diff --git a/org.eclipse.rmf.reqif10/epl-v10.html b/org.eclipse.rmf.reqif10/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.reqif10/epl-v10.html
+++ b/org.eclipse.rmf.reqif10/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10/model/reqif10.genmodel b/org.eclipse.rmf.reqif10/model/reqif10.genmodel
index 9510f37..ec5caea 100644
--- a/org.eclipse.rmf.reqif10/model/reqif10.genmodel
+++ b/org.eclipse.rmf.reqif10/model/reqif10.genmodel
@@ -1,11 +1,13 @@
 <?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" copyrightText="Copyright (c) 2013 itemis AG.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA;    Mark Broerkens - initial API and implementation&#xA;"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 itemis AG and others.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA;    Mark Broerkens - initial API and implementation&#xA;"
     modelDirectory="/org.eclipse.rmf.reqif10/src" editDirectory="/org.eclipse.rmf.reqif10.edit/src"
     editorDirectory="" modelPluginID="org.eclipse.rmf.reqif10" modelName="Reqif10"
-    editorPluginClass="" testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"
+    editorPluginClass="" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl"
+    testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"
     complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.rmf.reqif10.edit"
-    editorPluginID="org.eclipse.rmf.reqif10.editor" testsPluginID="org.eclipse.rmf.reqif10.editor">
+    editorPluginID="org.eclipse.rmf.reqif10.editor" testsPluginID="org.eclipse.rmf.reqif10.editor"
+    runtimeVersion="2.7">
   <foreignModel>reqif10.ecore</foreignModel>
   <genPackages prefix="ReqIF10" basePackage="org.eclipse.rmf" disposableProviderFactory="true"
       contentTypeIdentifier="org.eclipse.rmf.reqif10.reqif10XMLFile" fileExtensions="reqif"
diff --git a/org.eclipse.rmf.reqif10/notice.html b/org.eclipse.rmf.reqif10/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.reqif10/notice.html
+++ b/org.eclipse.rmf.reqif10/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10/plugin.properties b/org.eclipse.rmf.reqif10/plugin.properties
index 3e09389..443ad01 100644
--- a/org.eclipse.rmf.reqif10/plugin.properties
+++ b/org.eclipse.rmf.reqif10/plugin.properties
@@ -1,11 +1,13 @@
-# Copyright (c) 2012 itemis GmbH.
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # Contributors:
-#     Mark Broerkens - initial API and implementation
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 
 pluginName = RMF Core ReqIF Model (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/org.eclipse.rmf.reqif10/pom.xml b/org.eclipse.rmf.reqif10/pom.xml
index dd89f40..0bd0436 100644
--- a/org.eclipse.rmf.reqif10/pom.xml
+++ b/org.eclipse.rmf.reqif10/pom.xml
@@ -19,31 +19,13 @@
 	<parent>
 		<groupId>org.eclipse.rmf</groupId>
 		<artifactId>org.eclipse.rmf.releng</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.10.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.rmf.reqif10</artifactId>
-	<version>0.9.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.rmf.plugins</groupId>
 	<properties>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   	</properties>
- 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>plugin-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10/rmfFeature.png b/org.eclipse.rmf.reqif10/rmfFeature.png
new file mode 100644
index 0000000..ef6e74b
--- /dev/null
+++ b/org.eclipse.rmf.reqif10/rmfFeature.png
Binary files differ
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AccessControlledElement.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AccessControlledElement.java
index 4c3223e..c6bbd9d 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AccessControlledElement.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AccessControlledElement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,51 +11,47 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Access Controlled Element</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Access Controlled Element</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.AccessControlledElement#isEditable <em>Editable</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AccessControlledElement#isEditable <em>Editable</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAccessControlledElement()
- * @model abstract="true"
- *        extendedMetaData="name='ACCESS-CONTROLLED-ELEMENT' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ACCESS-CONTROLLED-ELEMENT'"
+ * @model abstract="true" extendedMetaData="name='ACCESS-CONTROLLED-ELEMENT' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ACCESS-CONTROLLED-ELEMENT'"
  * @generated
  */
 public interface AccessControlledElement extends Identifiable {
 	/**
-	 * Returns the value of the '<em><b>Editable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Editable</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Editable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Editable</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Editable</em>' attribute.
 	 * @see #isSetEditable()
 	 * @see #unsetEditable()
 	 * @see #setEditable(boolean)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAccessControlledElement_Editable()
-	 * @model unsettable="true" ordered="false"
-	 *        extendedMetaData="name='IS-EDITABLE' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='IS-EDITABLE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" ordered="false" extendedMetaData="name='IS-EDITABLE' kind='attribute'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='IS-EDITABLE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	boolean isEditable();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AccessControlledElement#isEditable <em>Editable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Editable</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AccessControlledElement#isEditable <em>Editable</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Editable</em>' attribute.
 	 * @see #isSetEditable()
 	 * @see #unsetEditable()
 	 * @see #isEditable()
@@ -64,9 +60,9 @@
 	void setEditable(boolean value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AccessControlledElement#isEditable <em>Editable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AccessControlledElement#isEditable <em>Editable</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetEditable()
 	 * @see #isEditable()
 	 * @see #setEditable(boolean)
@@ -75,9 +71,9 @@
 	void unsetEditable();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AccessControlledElement#isEditable <em>Editable</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AccessControlledElement#isEditable
+	 * <em>Editable</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Editable</em>' attribute is set.
 	 * @see #unsetEditable()
 	 * @see #isEditable()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AlternativeID.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AlternativeID.java
index c0cfdd4..0669f43 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AlternativeID.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AlternativeID.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,48 +14,46 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Alternative ID</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Alternative ID</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.AlternativeID#getIdentifier <em>Identifier</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AlternativeID#getIdentifier <em>Identifier</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAlternativeID()
- * @model extendedMetaData="name='ALTERNATIVE-ID' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ALTERNATIVE-ID'"
+ * @model extendedMetaData="name='ALTERNATIVE-ID' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ALTERNATIVE-ID'"
  * @generated
  */
 public interface AlternativeID extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Identifier</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Identifier</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Identifier</em>' attribute.
 	 * @see #isSetIdentifier()
 	 * @see #unsetIdentifier()
 	 * @see #setIdentifier(String)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAlternativeID_Identifier()
-	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='IDENTIFIER' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='IDENTIFIER' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" required="true" ordered="false" extendedMetaData="name='IDENTIFIER' kind='attribute'"
+	 *        annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='IDENTIFIER' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	String getIdentifier();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AlternativeID#getIdentifier <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Identifier</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AlternativeID#getIdentifier <em>Identifier</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Identifier</em>' attribute.
 	 * @see #isSetIdentifier()
 	 * @see #unsetIdentifier()
 	 * @see #getIdentifier()
@@ -64,9 +62,9 @@
 	void setIdentifier(String value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AlternativeID#getIdentifier <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AlternativeID#getIdentifier <em>Identifier</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetIdentifier()
 	 * @see #getIdentifier()
 	 * @see #setIdentifier(String)
@@ -75,9 +73,9 @@
 	void unsetIdentifier();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AlternativeID#getIdentifier <em>Identifier</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AlternativeID#getIdentifier <em>Identifier</em>}
+	 * ' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Identifier</em>' attribute is set.
 	 * @see #unsetIdentifier()
 	 * @see #getIdentifier()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinition.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinition.java
index 91b56ac..08496d4 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinition.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinition.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,17 +11,13 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Definition</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinition()
- * @model abstract="true"
- *        extendedMetaData="name='ATTRIBUTE-DEFINITION' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION'"
+ * @model abstract="true" extendedMetaData="name='ATTRIBUTE-DEFINITION' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION'"
  * @generated
  */
 public interface AttributeDefinition extends AccessControlledElement {
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionBoolean.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionBoolean.java
index 4bfe08b..31fbce7 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionBoolean.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionBoolean.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,51 +11,48 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Definition Boolean</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Definition Boolean</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getDefaultValue <em>Default Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getDefaultValue <em>Default Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionBoolean()
- * @model extendedMetaData="name='ATTRIBUTE-DEFINITION-BOOLEAN' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION-BOOLEAN'"
+ * @model extendedMetaData="name='ATTRIBUTE-DEFINITION-BOOLEAN' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION-BOOLEAN'"
  * @generated
  */
 public interface AttributeDefinitionBoolean extends AttributeDefinitionSimple {
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #setType(DatatypeDefinitionBoolean)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionBoolean_Type()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	DatatypeDefinitionBoolean getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getType <em>Type</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #getType()
@@ -64,9 +61,9 @@
 	void setType(DatatypeDefinitionBoolean value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getType <em>Type</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetType()
 	 * @see #getType()
 	 * @see #setType(DatatypeDefinitionBoolean)
@@ -75,9 +72,9 @@
 	void unsetType();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getType <em>Type</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getType
+	 * <em>Type</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Type</em>' reference is set.
 	 * @see #unsetType()
 	 * @see #getType()
@@ -87,30 +84,31 @@
 	boolean isSetType();
 
 	/**
-	 * Returns the value of the '<em><b>Default Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Default Value</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Default Value</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Default Value</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Default Value</em>' containment reference.
 	 * @see #isSetDefaultValue()
 	 * @see #unsetDefaultValue()
 	 * @see #setDefaultValue(AttributeValueBoolean)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionBoolean_DefaultValue()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='DEFAULT-VALUE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFAULT-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='DEFAULT-VALUE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFAULT-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	AttributeValueBoolean getDefaultValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getDefaultValue <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Value</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getDefaultValue
+	 * <em>Default Value</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Default Value</em>' containment reference.
 	 * @see #isSetDefaultValue()
 	 * @see #unsetDefaultValue()
 	 * @see #getDefaultValue()
@@ -119,9 +117,9 @@
 	void setDefaultValue(AttributeValueBoolean value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getDefaultValue <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getDefaultValue
+	 * <em>Default Value</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDefaultValue()
 	 * @see #getDefaultValue()
 	 * @see #setDefaultValue(AttributeValueBoolean)
@@ -130,9 +128,9 @@
 	void unsetDefaultValue();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getDefaultValue <em>Default Value</em>}' containment reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getDefaultValue
+	 * <em>Default Value</em>}' containment reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Default Value</em>' containment reference is set.
 	 * @see #unsetDefaultValue()
 	 * @see #getDefaultValue()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionDate.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionDate.java
index b75985c..250d93f 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionDate.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionDate.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,51 +11,48 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Definition Date</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Definition Date</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getDefaultValue <em>Default Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getDefaultValue <em>Default Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionDate()
- * @model extendedMetaData="name='ATTRIBUTE-DEFINITION-DATE' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION-DATE'"
+ * @model extendedMetaData="name='ATTRIBUTE-DEFINITION-DATE' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION-DATE'"
  * @generated
  */
 public interface AttributeDefinitionDate extends AttributeDefinitionSimple {
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #setType(DatatypeDefinitionDate)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionDate_Type()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	DatatypeDefinitionDate getType();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #getType()
@@ -64,9 +61,9 @@
 	void setType(DatatypeDefinitionDate value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getType <em>Type</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetType()
 	 * @see #getType()
 	 * @see #setType(DatatypeDefinitionDate)
@@ -75,9 +72,9 @@
 	void unsetType();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getType <em>Type</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getType <em>Type</em>}'
+	 * reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Type</em>' reference is set.
 	 * @see #unsetType()
 	 * @see #getType()
@@ -87,30 +84,31 @@
 	boolean isSetType();
 
 	/**
-	 * Returns the value of the '<em><b>Default Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Default Value</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Default Value</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Default Value</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Default Value</em>' containment reference.
 	 * @see #isSetDefaultValue()
 	 * @see #unsetDefaultValue()
 	 * @see #setDefaultValue(AttributeValueDate)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionDate_DefaultValue()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='DEFAULT-VALUE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFAULT-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='DEFAULT-VALUE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFAULT-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	AttributeValueDate getDefaultValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getDefaultValue <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Value</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getDefaultValue
+	 * <em>Default Value</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Default Value</em>' containment reference.
 	 * @see #isSetDefaultValue()
 	 * @see #unsetDefaultValue()
 	 * @see #getDefaultValue()
@@ -119,9 +117,9 @@
 	void setDefaultValue(AttributeValueDate value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getDefaultValue <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getDefaultValue
+	 * <em>Default Value</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDefaultValue()
 	 * @see #getDefaultValue()
 	 * @see #setDefaultValue(AttributeValueDate)
@@ -130,9 +128,9 @@
 	void unsetDefaultValue();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getDefaultValue <em>Default Value</em>}' containment reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getDefaultValue
+	 * <em>Default Value</em>}' containment reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Default Value</em>' containment reference is set.
 	 * @see #unsetDefaultValue()
 	 * @see #getDefaultValue()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionEnumeration.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionEnumeration.java
index f6c330f..eba36d1 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionEnumeration.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionEnumeration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,52 +11,50 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Definition Enumeration</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Definition Enumeration</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#isMultiValued <em>Multi Valued</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getDefaultValue <em>Default Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#isMultiValued <em>Multi Valued</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getDefaultValue <em>Default Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionEnumeration()
- * @model extendedMetaData="name='ATTRIBUTE-DEFINITION-ENUMERATION' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION-ENUMERATION'"
+ * @model extendedMetaData="name='ATTRIBUTE-DEFINITION-ENUMERATION' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION-ENUMERATION'"
  * @generated
  */
 public interface AttributeDefinitionEnumeration extends AttributeDefinition {
 	/**
-	 * Returns the value of the '<em><b>Multi Valued</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Multi Valued</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Multi Valued</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Multi Valued</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Multi Valued</em>' attribute.
 	 * @see #isSetMultiValued()
 	 * @see #unsetMultiValued()
 	 * @see #setMultiValued(boolean)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionEnumeration_MultiValued()
-	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='MULTI-VALUED' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='MULTI-VALUED' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" required="true" ordered="false" extendedMetaData="name='MULTI-VALUED' kind='attribute'"
+	 *        annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='MULTI-VALUED' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	boolean isMultiValued();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#isMultiValued <em>Multi Valued</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Multi Valued</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#isMultiValued
+	 * <em>Multi Valued</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Multi Valued</em>' attribute.
 	 * @see #isSetMultiValued()
 	 * @see #unsetMultiValued()
 	 * @see #isMultiValued()
@@ -65,9 +63,9 @@
 	void setMultiValued(boolean value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#isMultiValued <em>Multi Valued</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#isMultiValued
+	 * <em>Multi Valued</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetMultiValued()
 	 * @see #isMultiValued()
 	 * @see #setMultiValued(boolean)
@@ -76,9 +74,9 @@
 	void unsetMultiValued();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#isMultiValued <em>Multi Valued</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#isMultiValued
+	 * <em>Multi Valued</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Multi Valued</em>' attribute is set.
 	 * @see #unsetMultiValued()
 	 * @see #isMultiValued()
@@ -88,30 +86,30 @@
 	boolean isSetMultiValued();
 
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #setType(DatatypeDefinitionEnumeration)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionEnumeration_Type()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	DatatypeDefinitionEnumeration getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getType <em>Type</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #getType()
@@ -120,9 +118,9 @@
 	void setType(DatatypeDefinitionEnumeration value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getType <em>Type</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetType()
 	 * @see #getType()
 	 * @see #setType(DatatypeDefinitionEnumeration)
@@ -131,9 +129,9 @@
 	void unsetType();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getType <em>Type</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getType
+	 * <em>Type</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Type</em>' reference is set.
 	 * @see #unsetType()
 	 * @see #getType()
@@ -143,30 +141,31 @@
 	boolean isSetType();
 
 	/**
-	 * Returns the value of the '<em><b>Default Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Default Value</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Default Value</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Default Value</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Default Value</em>' containment reference.
 	 * @see #isSetDefaultValue()
 	 * @see #unsetDefaultValue()
 	 * @see #setDefaultValue(AttributeValueEnumeration)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionEnumeration_DefaultValue()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='DEFAULT-VALUE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFAULT-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='DEFAULT-VALUE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFAULT-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	AttributeValueEnumeration getDefaultValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getDefaultValue <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Value</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getDefaultValue
+	 * <em>Default Value</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Default Value</em>' containment reference.
 	 * @see #isSetDefaultValue()
 	 * @see #unsetDefaultValue()
 	 * @see #getDefaultValue()
@@ -175,9 +174,9 @@
 	void setDefaultValue(AttributeValueEnumeration value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getDefaultValue <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getDefaultValue
+	 * <em>Default Value</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDefaultValue()
 	 * @see #getDefaultValue()
 	 * @see #setDefaultValue(AttributeValueEnumeration)
@@ -186,9 +185,9 @@
 	void unsetDefaultValue();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getDefaultValue <em>Default Value</em>}' containment reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getDefaultValue
+	 * <em>Default Value</em>}' containment reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Default Value</em>' containment reference is set.
 	 * @see #unsetDefaultValue()
 	 * @see #getDefaultValue()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionInteger.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionInteger.java
index 7482f5f..c383c9d 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionInteger.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionInteger.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,51 +11,48 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Definition Integer</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Definition Integer</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getDefaultValue <em>Default Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getDefaultValue <em>Default Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionInteger()
- * @model extendedMetaData="name='ATTRIBUTE-DEFINITION-INTEGER' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION-INTEGER'"
+ * @model extendedMetaData="name='ATTRIBUTE-DEFINITION-INTEGER' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION-INTEGER'"
  * @generated
  */
 public interface AttributeDefinitionInteger extends AttributeDefinitionSimple {
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #setType(DatatypeDefinitionInteger)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionInteger_Type()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	DatatypeDefinitionInteger getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getType <em>Type</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #getType()
@@ -64,9 +61,9 @@
 	void setType(DatatypeDefinitionInteger value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getType <em>Type</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetType()
 	 * @see #getType()
 	 * @see #setType(DatatypeDefinitionInteger)
@@ -75,9 +72,9 @@
 	void unsetType();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getType <em>Type</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getType
+	 * <em>Type</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Type</em>' reference is set.
 	 * @see #unsetType()
 	 * @see #getType()
@@ -87,30 +84,31 @@
 	boolean isSetType();
 
 	/**
-	 * Returns the value of the '<em><b>Default Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Default Value</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Default Value</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Default Value</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Default Value</em>' containment reference.
 	 * @see #isSetDefaultValue()
 	 * @see #unsetDefaultValue()
 	 * @see #setDefaultValue(AttributeValueInteger)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionInteger_DefaultValue()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='DEFAULT-VALUE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFAULT-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='DEFAULT-VALUE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFAULT-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	AttributeValueInteger getDefaultValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getDefaultValue <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Value</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getDefaultValue
+	 * <em>Default Value</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Default Value</em>' containment reference.
 	 * @see #isSetDefaultValue()
 	 * @see #unsetDefaultValue()
 	 * @see #getDefaultValue()
@@ -119,9 +117,9 @@
 	void setDefaultValue(AttributeValueInteger value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getDefaultValue <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getDefaultValue
+	 * <em>Default Value</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDefaultValue()
 	 * @see #getDefaultValue()
 	 * @see #setDefaultValue(AttributeValueInteger)
@@ -130,9 +128,9 @@
 	void unsetDefaultValue();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getDefaultValue <em>Default Value</em>}' containment reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getDefaultValue
+	 * <em>Default Value</em>}' containment reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Default Value</em>' containment reference is set.
 	 * @see #unsetDefaultValue()
 	 * @see #getDefaultValue()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionReal.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionReal.java
index 629fca2..00dcae7 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionReal.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionReal.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,51 +11,48 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Definition Real</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Definition Real</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getDefaultValue <em>Default Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getDefaultValue <em>Default Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionReal()
- * @model extendedMetaData="name='ATTRIBUTE-DEFINITION-REAL' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION-REAL'"
+ * @model extendedMetaData="name='ATTRIBUTE-DEFINITION-REAL' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION-REAL'"
  * @generated
  */
 public interface AttributeDefinitionReal extends AttributeDefinitionSimple {
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #setType(DatatypeDefinitionReal)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionReal_Type()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	DatatypeDefinitionReal getType();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #getType()
@@ -64,9 +61,9 @@
 	void setType(DatatypeDefinitionReal value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getType <em>Type</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetType()
 	 * @see #getType()
 	 * @see #setType(DatatypeDefinitionReal)
@@ -75,9 +72,9 @@
 	void unsetType();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getType <em>Type</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getType <em>Type</em>}'
+	 * reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Type</em>' reference is set.
 	 * @see #unsetType()
 	 * @see #getType()
@@ -87,30 +84,31 @@
 	boolean isSetType();
 
 	/**
-	 * Returns the value of the '<em><b>Default Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Default Value</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Default Value</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Default Value</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Default Value</em>' containment reference.
 	 * @see #isSetDefaultValue()
 	 * @see #unsetDefaultValue()
 	 * @see #setDefaultValue(AttributeValueReal)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionReal_DefaultValue()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='DEFAULT-VALUE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFAULT-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='DEFAULT-VALUE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFAULT-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	AttributeValueReal getDefaultValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getDefaultValue <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Value</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getDefaultValue
+	 * <em>Default Value</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Default Value</em>' containment reference.
 	 * @see #isSetDefaultValue()
 	 * @see #unsetDefaultValue()
 	 * @see #getDefaultValue()
@@ -119,9 +117,9 @@
 	void setDefaultValue(AttributeValueReal value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getDefaultValue <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getDefaultValue
+	 * <em>Default Value</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDefaultValue()
 	 * @see #getDefaultValue()
 	 * @see #setDefaultValue(AttributeValueReal)
@@ -130,9 +128,9 @@
 	void unsetDefaultValue();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getDefaultValue <em>Default Value</em>}' containment reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getDefaultValue
+	 * <em>Default Value</em>}' containment reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Default Value</em>' containment reference is set.
 	 * @see #unsetDefaultValue()
 	 * @see #getDefaultValue()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionSimple.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionSimple.java
index a28f422..2b4add6 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionSimple.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionSimple.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,17 +11,13 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Definition Simple</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Definition Simple</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionSimple()
- * @model abstract="true"
- *        extendedMetaData="name='ATTRIBUTE-DEFINITION-SIMPLE' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION-SIMPLE'"
+ * @model abstract="true" extendedMetaData="name='ATTRIBUTE-DEFINITION-SIMPLE' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION-SIMPLE'"
  * @generated
  */
 public interface AttributeDefinitionSimple extends AttributeDefinition {
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionString.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionString.java
index 38cc18b..8fe50cc 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionString.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionString.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,51 +11,48 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Definition String</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Definition String</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getDefaultValue <em>Default Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getDefaultValue <em>Default Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionString()
- * @model extendedMetaData="name='ATTRIBUTE-DEFINITION-STRING' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION-STRING'"
+ * @model extendedMetaData="name='ATTRIBUTE-DEFINITION-STRING' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION-STRING'"
  * @generated
  */
 public interface AttributeDefinitionString extends AttributeDefinitionSimple {
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #setType(DatatypeDefinitionString)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionString_Type()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	DatatypeDefinitionString getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getType <em>Type</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #getType()
@@ -64,9 +61,9 @@
 	void setType(DatatypeDefinitionString value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getType <em>Type</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetType()
 	 * @see #getType()
 	 * @see #setType(DatatypeDefinitionString)
@@ -75,9 +72,9 @@
 	void unsetType();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getType <em>Type</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getType <em>Type</em>}
+	 * ' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Type</em>' reference is set.
 	 * @see #unsetType()
 	 * @see #getType()
@@ -87,30 +84,31 @@
 	boolean isSetType();
 
 	/**
-	 * Returns the value of the '<em><b>Default Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Default Value</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Default Value</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Default Value</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Default Value</em>' containment reference.
 	 * @see #isSetDefaultValue()
 	 * @see #unsetDefaultValue()
 	 * @see #setDefaultValue(AttributeValueString)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionString_DefaultValue()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='DEFAULT-VALUE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFAULT-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='DEFAULT-VALUE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFAULT-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	AttributeValueString getDefaultValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getDefaultValue <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Value</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getDefaultValue
+	 * <em>Default Value</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Default Value</em>' containment reference.
 	 * @see #isSetDefaultValue()
 	 * @see #unsetDefaultValue()
 	 * @see #getDefaultValue()
@@ -119,9 +117,9 @@
 	void setDefaultValue(AttributeValueString value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getDefaultValue <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getDefaultValue
+	 * <em>Default Value</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDefaultValue()
 	 * @see #getDefaultValue()
 	 * @see #setDefaultValue(AttributeValueString)
@@ -130,9 +128,9 @@
 	void unsetDefaultValue();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getDefaultValue <em>Default Value</em>}' containment reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getDefaultValue
+	 * <em>Default Value</em>}' containment reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Default Value</em>' containment reference is set.
 	 * @see #unsetDefaultValue()
 	 * @see #getDefaultValue()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionXHTML.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionXHTML.java
index 8d511df..7ff61a4 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionXHTML.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeDefinitionXHTML.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,51 +11,48 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Definition XHTML</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Definition XHTML</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getDefaultValue <em>Default Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getDefaultValue <em>Default Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionXHTML()
- * @model extendedMetaData="name='ATTRIBUTE-DEFINITION-XHTML' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION-XHTML'"
+ * @model extendedMetaData="name='ATTRIBUTE-DEFINITION-XHTML' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-DEFINITION-XHTML'"
  * @generated
  */
 public interface AttributeDefinitionXHTML extends AttributeDefinition {
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #setType(DatatypeDefinitionXHTML)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionXHTML_Type()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	DatatypeDefinitionXHTML getType();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #getType()
@@ -64,9 +61,9 @@
 	void setType(DatatypeDefinitionXHTML value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getType <em>Type</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetType()
 	 * @see #getType()
 	 * @see #setType(DatatypeDefinitionXHTML)
@@ -75,9 +72,9 @@
 	void unsetType();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getType <em>Type</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getType <em>Type</em>}'
+	 * reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Type</em>' reference is set.
 	 * @see #unsetType()
 	 * @see #getType()
@@ -87,30 +84,31 @@
 	boolean isSetType();
 
 	/**
-	 * Returns the value of the '<em><b>Default Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Default Value</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Default Value</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Default Value</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Default Value</em>' containment reference.
 	 * @see #isSetDefaultValue()
 	 * @see #unsetDefaultValue()
 	 * @see #setDefaultValue(AttributeValueXHTML)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeDefinitionXHTML_DefaultValue()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='DEFAULT-VALUE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFAULT-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='DEFAULT-VALUE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFAULT-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	AttributeValueXHTML getDefaultValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getDefaultValue <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Value</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getDefaultValue
+	 * <em>Default Value</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Default Value</em>' containment reference.
 	 * @see #isSetDefaultValue()
 	 * @see #unsetDefaultValue()
 	 * @see #getDefaultValue()
@@ -119,9 +117,9 @@
 	void setDefaultValue(AttributeValueXHTML value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getDefaultValue <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getDefaultValue
+	 * <em>Default Value</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDefaultValue()
 	 * @see #getDefaultValue()
 	 * @see #setDefaultValue(AttributeValueXHTML)
@@ -130,9 +128,9 @@
 	void unsetDefaultValue();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getDefaultValue <em>Default Value</em>}' containment reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getDefaultValue
+	 * <em>Default Value</em>}' containment reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Default Value</em>' containment reference is set.
 	 * @see #unsetDefaultValue()
 	 * @see #getDefaultValue()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValue.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValue.java
index 08fe111..c8dded6 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValue.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValue.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,15 +14,11 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Value</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Value</b></em>'. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValue()
- * @model abstract="true"
- *        extendedMetaData="name='ATTRIBUTE-VALUE' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE'"
+ * @model abstract="true" extendedMetaData="name='ATTRIBUTE-VALUE' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE'"
  * @generated
  */
 public interface AttributeValue extends EObject {
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueBoolean.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueBoolean.java
index c14b745..1ebf117 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueBoolean.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueBoolean.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,51 +11,49 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Value Boolean</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Value Boolean</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#isTheValue <em>The Value</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#getDefinition <em>Definition</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#isTheValue <em>The Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#getDefinition <em>Definition</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueBoolean()
- * @model extendedMetaData="name='ATTRIBUTE-VALUE-BOOLEAN' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE-BOOLEAN'"
+ * @model extendedMetaData="name='ATTRIBUTE-VALUE-BOOLEAN' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE-BOOLEAN'"
  * @generated
  */
 public interface AttributeValueBoolean extends AttributeValueSimple {
 	/**
-	 * Returns the value of the '<em><b>The Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>The Value</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>The Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>The Value</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>The Value</em>' attribute.
 	 * @see #isSetTheValue()
 	 * @see #unsetTheValue()
 	 * @see #setTheValue(boolean)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueBoolean_TheValue()
-	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='THE-VALUE' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='THE-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" required="true" ordered="false" extendedMetaData="name='THE-VALUE' kind='attribute'"
+	 *        annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='THE-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	boolean isTheValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#isTheValue <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>The Value</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#isTheValue <em>The Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>The Value</em>' attribute.
 	 * @see #isSetTheValue()
 	 * @see #unsetTheValue()
 	 * @see #isTheValue()
@@ -64,9 +62,9 @@
 	void setTheValue(boolean value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#isTheValue <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#isTheValue <em>The Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetTheValue()
 	 * @see #isTheValue()
 	 * @see #setTheValue(boolean)
@@ -75,9 +73,9 @@
 	void unsetTheValue();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#isTheValue <em>The Value</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#isTheValue
+	 * <em>The Value</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>The Value</em>' attribute is set.
 	 * @see #unsetTheValue()
 	 * @see #isTheValue()
@@ -87,30 +85,31 @@
 	boolean isSetTheValue();
 
 	/**
-	 * Returns the value of the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Definition</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Definition</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Definition</em>' reference isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Definition</em>' reference.
 	 * @see #isSetDefinition()
 	 * @see #unsetDefinition()
 	 * @see #setDefinition(AttributeDefinitionBoolean)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueBoolean_Definition()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='DEFINITION' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFINITION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='DEFINITION' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFINITION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	AttributeDefinitionBoolean getDefinition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#getDefinition <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Definition</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#getDefinition <em>Definition</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Definition</em>' reference.
 	 * @see #isSetDefinition()
 	 * @see #unsetDefinition()
 	 * @see #getDefinition()
@@ -119,9 +118,9 @@
 	void setDefinition(AttributeDefinitionBoolean value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#getDefinition <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#getDefinition <em>Definition</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDefinition()
 	 * @see #getDefinition()
 	 * @see #setDefinition(AttributeDefinitionBoolean)
@@ -130,9 +129,9 @@
 	void unsetDefinition();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#getDefinition <em>Definition</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#getDefinition
+	 * <em>Definition</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Definition</em>' reference is set.
 	 * @see #unsetDefinition()
 	 * @see #getDefinition()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueDate.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueDate.java
index 8e55fc9..291330a 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueDate.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueDate.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,52 +12,50 @@
 package org.eclipse.rmf.reqif10;
 
 import java.util.GregorianCalendar;
-import javax.xml.datatype.XMLGregorianCalendar;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Value Date</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Value Date</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeValueDate#getTheValue <em>The Value</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeValueDate#getDefinition <em>Definition</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeValueDate#getTheValue <em>The Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeValueDate#getDefinition <em>Definition</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueDate()
- * @model extendedMetaData="name='ATTRIBUTE-VALUE-DATE' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE-DATE'"
+ * @model extendedMetaData="name='ATTRIBUTE-VALUE-DATE' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE-DATE'"
  * @generated
  */
 public interface AttributeValueDate extends AttributeValueSimple {
 	/**
-	 * Returns the value of the '<em><b>The Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>The Value</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>The Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>The Value</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>The Value</em>' attribute.
 	 * @see #isSetTheValue()
 	 * @see #unsetTheValue()
 	 * @see #setTheValue(GregorianCalendar)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueDate_TheValue()
 	 * @model unsettable="true" dataType="org.eclipse.rmf.reqif10.DateTime" required="true" ordered="false"
-	 *        extendedMetaData="name='THE-VALUE' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='THE-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 *        extendedMetaData="name='THE-VALUE' kind='attribute'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='THE-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	GregorianCalendar getTheValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueDate#getTheValue <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>The Value</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueDate#getTheValue <em>The Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>The Value</em>' attribute.
 	 * @see #isSetTheValue()
 	 * @see #unsetTheValue()
 	 * @see #getTheValue()
@@ -66,9 +64,9 @@
 	void setTheValue(GregorianCalendar value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueDate#getTheValue <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueDate#getTheValue <em>The Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetTheValue()
 	 * @see #getTheValue()
 	 * @see #setTheValue(GregorianCalendar)
@@ -77,9 +75,9 @@
 	void unsetTheValue();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueDate#getTheValue <em>The Value</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueDate#getTheValue
+	 * <em>The Value</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>The Value</em>' attribute is set.
 	 * @see #unsetTheValue()
 	 * @see #getTheValue()
@@ -89,30 +87,31 @@
 	boolean isSetTheValue();
 
 	/**
-	 * Returns the value of the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Definition</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Definition</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Definition</em>' reference isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Definition</em>' reference.
 	 * @see #isSetDefinition()
 	 * @see #unsetDefinition()
 	 * @see #setDefinition(AttributeDefinitionDate)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueDate_Definition()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='DEFINITION' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFINITION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='DEFINITION' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFINITION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	AttributeDefinitionDate getDefinition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueDate#getDefinition <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Definition</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueDate#getDefinition <em>Definition</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Definition</em>' reference.
 	 * @see #isSetDefinition()
 	 * @see #unsetDefinition()
 	 * @see #getDefinition()
@@ -121,9 +120,9 @@
 	void setDefinition(AttributeDefinitionDate value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueDate#getDefinition <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueDate#getDefinition <em>Definition</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDefinition()
 	 * @see #getDefinition()
 	 * @see #setDefinition(AttributeDefinitionDate)
@@ -132,9 +131,9 @@
 	void unsetDefinition();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueDate#getDefinition <em>Definition</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueDate#getDefinition
+	 * <em>Definition</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Definition</em>' reference is set.
 	 * @see #unsetDefinition()
 	 * @see #getDefinition()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueEnumeration.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueEnumeration.java
index 1584497..2096aaf 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueEnumeration.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueEnumeration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,48 +14,46 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Value Enumeration</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Value Enumeration</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getValues <em>Values</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getDefinition <em>Definition</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getValues <em>Values</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getDefinition <em>Definition</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueEnumeration()
- * @model extendedMetaData="name='ATTRIBUTE-VALUE-ENUMERATION' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE-ENUMERATION'"
+ * @model extendedMetaData="name='ATTRIBUTE-VALUE-ENUMERATION' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE-ENUMERATION'"
  * @generated
  */
 public interface AttributeValueEnumeration extends AttributeValue {
 	/**
-	 * Returns the value of the '<em><b>Values</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.EnumValue}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Values</b></em>' reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.EnumValue}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Values</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Values</em>' reference list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Values</em>' reference list.
 	 * @see #isSetValues()
 	 * @see #unsetValues()
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueEnumeration_Values()
 	 * @model unsettable="true" ordered="false"
-	 *        extendedMetaData="name='VALUES' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='VALUES' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='VALUES' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='VALUES' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	EList<EnumValue> getValues();
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getValues <em>Values</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getValues <em>Values</em>}'
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetValues()
 	 * @see #getValues()
 	 * @generated
@@ -63,9 +61,9 @@
 	void unsetValues();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getValues <em>Values</em>}' reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getValues
+	 * <em>Values</em>}' reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Values</em>' reference list is set.
 	 * @see #unsetValues()
 	 * @see #getValues()
@@ -74,30 +72,31 @@
 	boolean isSetValues();
 
 	/**
-	 * Returns the value of the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Definition</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Definition</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Definition</em>' reference isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Definition</em>' reference.
 	 * @see #isSetDefinition()
 	 * @see #unsetDefinition()
 	 * @see #setDefinition(AttributeDefinitionEnumeration)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueEnumeration_Definition()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='DEFINITION' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFINITION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='DEFINITION' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFINITION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	AttributeDefinitionEnumeration getDefinition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getDefinition <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Definition</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getDefinition
+	 * <em>Definition</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Definition</em>' reference.
 	 * @see #isSetDefinition()
 	 * @see #unsetDefinition()
 	 * @see #getDefinition()
@@ -106,9 +105,9 @@
 	void setDefinition(AttributeDefinitionEnumeration value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getDefinition <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getDefinition
+	 * <em>Definition</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDefinition()
 	 * @see #getDefinition()
 	 * @see #setDefinition(AttributeDefinitionEnumeration)
@@ -117,9 +116,9 @@
 	void unsetDefinition();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getDefinition <em>Definition</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getDefinition
+	 * <em>Definition</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Definition</em>' reference is set.
 	 * @see #unsetDefinition()
 	 * @see #getDefinition()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueInteger.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueInteger.java
index 182a84e..7079678 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueInteger.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueInteger.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,49 +14,48 @@
 import java.math.BigInteger;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Value Integer</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Value Integer</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getTheValue <em>The Value</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getDefinition <em>Definition</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getTheValue <em>The Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getDefinition <em>Definition</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueInteger()
- * @model extendedMetaData="name='ATTRIBUTE-VALUE-INTEGER' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE-INTEGER'"
+ * @model extendedMetaData="name='ATTRIBUTE-VALUE-INTEGER' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE-INTEGER'"
  * @generated
  */
 public interface AttributeValueInteger extends AttributeValueSimple {
 	/**
-	 * Returns the value of the '<em><b>The Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>The Value</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>The Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>The Value</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>The Value</em>' attribute.
 	 * @see #isSetTheValue()
 	 * @see #unsetTheValue()
 	 * @see #setTheValue(BigInteger)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueInteger_TheValue()
-	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='THE-VALUE' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='THE-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" required="true" ordered="false" extendedMetaData="name='THE-VALUE' kind='attribute'"
+	 *        annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='THE-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	BigInteger getTheValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getTheValue <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>The Value</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getTheValue <em>The Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>The Value</em>' attribute.
 	 * @see #isSetTheValue()
 	 * @see #unsetTheValue()
 	 * @see #getTheValue()
@@ -65,9 +64,9 @@
 	void setTheValue(BigInteger value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getTheValue <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getTheValue <em>The Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetTheValue()
 	 * @see #getTheValue()
 	 * @see #setTheValue(BigInteger)
@@ -76,9 +75,9 @@
 	void unsetTheValue();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getTheValue <em>The Value</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getTheValue
+	 * <em>The Value</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>The Value</em>' attribute is set.
 	 * @see #unsetTheValue()
 	 * @see #getTheValue()
@@ -88,30 +87,31 @@
 	boolean isSetTheValue();
 
 	/**
-	 * Returns the value of the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Definition</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Definition</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Definition</em>' reference isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Definition</em>' reference.
 	 * @see #isSetDefinition()
 	 * @see #unsetDefinition()
 	 * @see #setDefinition(AttributeDefinitionInteger)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueInteger_Definition()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='DEFINITION' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFINITION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='DEFINITION' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFINITION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	AttributeDefinitionInteger getDefinition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getDefinition <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Definition</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getDefinition <em>Definition</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Definition</em>' reference.
 	 * @see #isSetDefinition()
 	 * @see #unsetDefinition()
 	 * @see #getDefinition()
@@ -120,9 +120,9 @@
 	void setDefinition(AttributeDefinitionInteger value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getDefinition <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getDefinition <em>Definition</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDefinition()
 	 * @see #getDefinition()
 	 * @see #setDefinition(AttributeDefinitionInteger)
@@ -131,9 +131,9 @@
 	void unsetDefinition();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getDefinition <em>Definition</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getDefinition
+	 * <em>Definition</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Definition</em>' reference is set.
 	 * @see #unsetDefinition()
 	 * @see #getDefinition()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueReal.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueReal.java
index 7b5117c..a48591e 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueReal.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueReal.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,51 +11,49 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Value Real</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Value Real</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeValueReal#getTheValue <em>The Value</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeValueReal#getDefinition <em>Definition</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeValueReal#getTheValue <em>The Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeValueReal#getDefinition <em>Definition</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueReal()
- * @model extendedMetaData="name='ATTRIBUTE-VALUE-REAL' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE-REAL'"
+ * @model extendedMetaData="name='ATTRIBUTE-VALUE-REAL' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE-REAL'"
  * @generated
  */
 public interface AttributeValueReal extends AttributeValueSimple {
 	/**
-	 * Returns the value of the '<em><b>The Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>The Value</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>The Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>The Value</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>The Value</em>' attribute.
 	 * @see #isSetTheValue()
 	 * @see #unsetTheValue()
 	 * @see #setTheValue(double)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueReal_TheValue()
-	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='THE-VALUE' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='THE-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" required="true" ordered="false" extendedMetaData="name='THE-VALUE' kind='attribute'"
+	 *        annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='THE-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	double getTheValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueReal#getTheValue <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>The Value</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueReal#getTheValue <em>The Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>The Value</em>' attribute.
 	 * @see #isSetTheValue()
 	 * @see #unsetTheValue()
 	 * @see #getTheValue()
@@ -64,9 +62,9 @@
 	void setTheValue(double value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueReal#getTheValue <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueReal#getTheValue <em>The Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetTheValue()
 	 * @see #getTheValue()
 	 * @see #setTheValue(double)
@@ -75,9 +73,9 @@
 	void unsetTheValue();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueReal#getTheValue <em>The Value</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueReal#getTheValue
+	 * <em>The Value</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>The Value</em>' attribute is set.
 	 * @see #unsetTheValue()
 	 * @see #getTheValue()
@@ -87,30 +85,31 @@
 	boolean isSetTheValue();
 
 	/**
-	 * Returns the value of the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Definition</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Definition</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Definition</em>' reference isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Definition</em>' reference.
 	 * @see #isSetDefinition()
 	 * @see #unsetDefinition()
 	 * @see #setDefinition(AttributeDefinitionReal)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueReal_Definition()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='DEFINITION' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFINITION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='DEFINITION' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFINITION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	AttributeDefinitionReal getDefinition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueReal#getDefinition <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Definition</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueReal#getDefinition <em>Definition</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Definition</em>' reference.
 	 * @see #isSetDefinition()
 	 * @see #unsetDefinition()
 	 * @see #getDefinition()
@@ -119,9 +118,9 @@
 	void setDefinition(AttributeDefinitionReal value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueReal#getDefinition <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueReal#getDefinition <em>Definition</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDefinition()
 	 * @see #getDefinition()
 	 * @see #setDefinition(AttributeDefinitionReal)
@@ -130,9 +129,9 @@
 	void unsetDefinition();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueReal#getDefinition <em>Definition</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueReal#getDefinition
+	 * <em>Definition</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Definition</em>' reference is set.
 	 * @see #unsetDefinition()
 	 * @see #getDefinition()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueSimple.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueSimple.java
index c348005..5446c27 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueSimple.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueSimple.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,17 +11,13 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Value Simple</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Value Simple</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueSimple()
- * @model abstract="true"
- *        extendedMetaData="name='ATTRIBUTE-VALUE-SIMPLE' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE-SIMPLE'"
+ * @model abstract="true" extendedMetaData="name='ATTRIBUTE-VALUE-SIMPLE' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE-SIMPLE'"
  * @generated
  */
 public interface AttributeValueSimple extends AttributeValue {
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueString.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueString.java
index 7c4ec74..8f27321 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueString.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueString.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,51 +11,49 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Value String</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Value String</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeValueString#getTheValue <em>The Value</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeValueString#getDefinition <em>Definition</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeValueString#getTheValue <em>The Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeValueString#getDefinition <em>Definition</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueString()
- * @model extendedMetaData="name='ATTRIBUTE-VALUE-STRING' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE-STRING'"
+ * @model extendedMetaData="name='ATTRIBUTE-VALUE-STRING' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE-STRING'"
  * @generated
  */
 public interface AttributeValueString extends AttributeValueSimple {
 	/**
-	 * Returns the value of the '<em><b>The Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>The Value</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>The Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>The Value</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>The Value</em>' attribute.
 	 * @see #isSetTheValue()
 	 * @see #unsetTheValue()
 	 * @see #setTheValue(String)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueString_TheValue()
-	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='THE-VALUE' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='THE-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" required="true" ordered="false" extendedMetaData="name='THE-VALUE' kind='attribute'"
+	 *        annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='THE-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	String getTheValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueString#getTheValue <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>The Value</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueString#getTheValue <em>The Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>The Value</em>' attribute.
 	 * @see #isSetTheValue()
 	 * @see #unsetTheValue()
 	 * @see #getTheValue()
@@ -64,9 +62,9 @@
 	void setTheValue(String value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueString#getTheValue <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueString#getTheValue <em>The Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetTheValue()
 	 * @see #getTheValue()
 	 * @see #setTheValue(String)
@@ -75,9 +73,9 @@
 	void unsetTheValue();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueString#getTheValue <em>The Value</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueString#getTheValue
+	 * <em>The Value</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>The Value</em>' attribute is set.
 	 * @see #unsetTheValue()
 	 * @see #getTheValue()
@@ -87,30 +85,31 @@
 	boolean isSetTheValue();
 
 	/**
-	 * Returns the value of the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Definition</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Definition</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Definition</em>' reference isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Definition</em>' reference.
 	 * @see #isSetDefinition()
 	 * @see #unsetDefinition()
 	 * @see #setDefinition(AttributeDefinitionString)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueString_Definition()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='DEFINITION' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFINITION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='DEFINITION' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFINITION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	AttributeDefinitionString getDefinition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueString#getDefinition <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Definition</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueString#getDefinition <em>Definition</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Definition</em>' reference.
 	 * @see #isSetDefinition()
 	 * @see #unsetDefinition()
 	 * @see #getDefinition()
@@ -119,9 +118,9 @@
 	void setDefinition(AttributeDefinitionString value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueString#getDefinition <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueString#getDefinition <em>Definition</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDefinition()
 	 * @see #getDefinition()
 	 * @see #setDefinition(AttributeDefinitionString)
@@ -130,9 +129,9 @@
 	void unsetDefinition();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueString#getDefinition <em>Definition</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueString#getDefinition
+	 * <em>Definition</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Definition</em>' reference is set.
 	 * @see #unsetDefinition()
 	 * @see #getDefinition()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueXHTML.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueXHTML.java
index a57eb88..c55d8d7 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueXHTML.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/AttributeValueXHTML.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,53 +11,50 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Value XHTML</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Attribute Value XHTML</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#isSimplified <em>Simplified</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getDefinition <em>Definition</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheOriginalValue <em>The Original Value</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheValue <em>The Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#isSimplified <em>Simplified</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getDefinition <em>Definition</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheOriginalValue <em>The Original Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheValue <em>The Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueXHTML()
- * @model extendedMetaData="name='ATTRIBUTE-VALUE-XHTML' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE-XHTML'"
+ * @model extendedMetaData="name='ATTRIBUTE-VALUE-XHTML' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ATTRIBUTE-VALUE-XHTML'"
  * @generated
  */
 public interface AttributeValueXHTML extends AttributeValue {
 	/**
-	 * Returns the value of the '<em><b>Simplified</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Simplified</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Simplified</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Simplified</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Simplified</em>' attribute.
 	 * @see #isSetSimplified()
 	 * @see #unsetSimplified()
 	 * @see #setSimplified(boolean)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueXHTML_Simplified()
-	 * @model unsettable="true" ordered="false"
-	 *        extendedMetaData="name='IS-SIMPLIFIED' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='IS-SIMPLIFIED' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" ordered="false" extendedMetaData="name='IS-SIMPLIFIED' kind='attribute'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='IS-SIMPLIFIED' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	boolean isSimplified();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#isSimplified <em>Simplified</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Simplified</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#isSimplified <em>Simplified</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Simplified</em>' attribute.
 	 * @see #isSetSimplified()
 	 * @see #unsetSimplified()
 	 * @see #isSimplified()
@@ -66,9 +63,9 @@
 	void setSimplified(boolean value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#isSimplified <em>Simplified</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#isSimplified <em>Simplified</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSimplified()
 	 * @see #isSimplified()
 	 * @see #setSimplified(boolean)
@@ -77,9 +74,9 @@
 	void unsetSimplified();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#isSimplified <em>Simplified</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#isSimplified
+	 * <em>Simplified</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Simplified</em>' attribute is set.
 	 * @see #unsetSimplified()
 	 * @see #isSimplified()
@@ -89,30 +86,31 @@
 	boolean isSetSimplified();
 
 	/**
-	 * Returns the value of the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Definition</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Definition</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Definition</em>' reference isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Definition</em>' reference.
 	 * @see #isSetDefinition()
 	 * @see #unsetDefinition()
 	 * @see #setDefinition(AttributeDefinitionXHTML)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueXHTML_Definition()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='DEFINITION' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFINITION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='DEFINITION' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DEFINITION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	AttributeDefinitionXHTML getDefinition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getDefinition <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Definition</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getDefinition <em>Definition</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Definition</em>' reference.
 	 * @see #isSetDefinition()
 	 * @see #unsetDefinition()
 	 * @see #getDefinition()
@@ -121,9 +119,9 @@
 	void setDefinition(AttributeDefinitionXHTML value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getDefinition <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getDefinition <em>Definition</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDefinition()
 	 * @see #getDefinition()
 	 * @see #setDefinition(AttributeDefinitionXHTML)
@@ -132,9 +130,9 @@
 	void unsetDefinition();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getDefinition <em>Definition</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getDefinition
+	 * <em>Definition</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Definition</em>' reference is set.
 	 * @see #unsetDefinition()
 	 * @see #getDefinition()
@@ -144,30 +142,31 @@
 	boolean isSetDefinition();
 
 	/**
-	 * Returns the value of the '<em><b>The Original Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>The Original Value</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>The Original Value</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>The Original Value</em>' containment reference isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>The Original Value</em>' containment reference.
 	 * @see #isSetTheOriginalValue()
 	 * @see #unsetTheOriginalValue()
 	 * @see #setTheOriginalValue(XhtmlContent)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueXHTML_TheOriginalValue()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='THE-ORIGINAL-VALUE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='THE-ORIGINAL-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 *        extendedMetaData="name='THE-ORIGINAL-VALUE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='THE-ORIGINAL-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	XhtmlContent getTheOriginalValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheOriginalValue <em>The Original Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>The Original Value</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheOriginalValue
+	 * <em>The Original Value</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>The Original Value</em>' containment reference.
 	 * @see #isSetTheOriginalValue()
 	 * @see #unsetTheOriginalValue()
 	 * @see #getTheOriginalValue()
@@ -176,9 +175,9 @@
 	void setTheOriginalValue(XhtmlContent value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheOriginalValue <em>The Original Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheOriginalValue
+	 * <em>The Original Value</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetTheOriginalValue()
 	 * @see #getTheOriginalValue()
 	 * @see #setTheOriginalValue(XhtmlContent)
@@ -187,9 +186,9 @@
 	void unsetTheOriginalValue();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheOriginalValue <em>The Original Value</em>}' containment reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheOriginalValue
+	 * <em>The Original Value</em>}' containment reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>The Original Value</em>' containment reference is set.
 	 * @see #unsetTheOriginalValue()
 	 * @see #getTheOriginalValue()
@@ -199,30 +198,31 @@
 	boolean isSetTheOriginalValue();
 
 	/**
-	 * Returns the value of the '<em><b>The Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>The Value</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>The Value</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>The Value</em>' containment reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>The Value</em>' containment reference.
 	 * @see #isSetTheValue()
 	 * @see #unsetTheValue()
 	 * @see #setTheValue(XhtmlContent)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getAttributeValueXHTML_TheValue()
 	 * @model containment="true" unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='THE-VALUE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='THE-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 *        extendedMetaData="name='THE-VALUE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='THE-VALUE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	XhtmlContent getTheValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheValue <em>The Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>The Value</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheValue <em>The Value</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>The Value</em>' containment reference.
 	 * @see #isSetTheValue()
 	 * @see #unsetTheValue()
 	 * @see #getTheValue()
@@ -231,9 +231,9 @@
 	void setTheValue(XhtmlContent value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheValue <em>The Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheValue <em>The Value</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetTheValue()
 	 * @see #getTheValue()
 	 * @see #setTheValue(XhtmlContent)
@@ -242,9 +242,9 @@
 	void unsetTheValue();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheValue <em>The Value</em>}' containment reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheValue
+	 * <em>The Value</em>}' containment reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>The Value</em>' containment reference is set.
 	 * @see #unsetTheValue()
 	 * @see #getTheValue()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinition.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinition.java
index 23a12b5..4bfa002 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinition.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinition.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,17 +11,13 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Datatype Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Datatype Definition</b></em>'. <!-- end-user-doc
+ * -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getDatatypeDefinition()
- * @model abstract="true"
- *        extendedMetaData="name='DATATYPE-DEFINITION' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION'"
+ * @model abstract="true" extendedMetaData="name='DATATYPE-DEFINITION' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION'"
  * @generated
  */
 public interface DatatypeDefinition extends Identifiable {
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionBoolean.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionBoolean.java
index 20ca046..7b95743 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionBoolean.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionBoolean.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,16 +11,13 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Datatype Definition Boolean</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Datatype Definition Boolean</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getDatatypeDefinitionBoolean()
- * @model extendedMetaData="name='DATATYPE-DEFINITION-BOOLEAN' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION-BOOLEAN'"
+ * @model extendedMetaData="name='DATATYPE-DEFINITION-BOOLEAN' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION-BOOLEAN'"
  * @generated
  */
 public interface DatatypeDefinitionBoolean extends DatatypeDefinitionSimple {
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionDate.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionDate.java
index 67fde31..8258e1e 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionDate.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionDate.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,16 +11,13 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Datatype Definition Date</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Datatype Definition Date</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getDatatypeDefinitionDate()
- * @model extendedMetaData="name='DATATYPE-DEFINITION-DATE' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION-DATE'"
+ * @model extendedMetaData="name='DATATYPE-DEFINITION-DATE' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION-DATE'"
  * @generated
  */
 public interface DatatypeDefinitionDate extends DatatypeDefinitionSimple {
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionEnumeration.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionEnumeration.java
index ebbe68b..de4b8a3 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionEnumeration.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionEnumeration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,47 +14,45 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Datatype Definition Enumeration</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Datatype Definition Enumeration</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration#getSpecifiedValues <em>Specified Values</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration#getSpecifiedValues <em>Specified Values</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getDatatypeDefinitionEnumeration()
- * @model extendedMetaData="name='DATATYPE-DEFINITION-ENUMERATION' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION-ENUMERATION'"
+ * @model extendedMetaData="name='DATATYPE-DEFINITION-ENUMERATION' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION-ENUMERATION'"
  * @generated
  */
 public interface DatatypeDefinitionEnumeration extends DatatypeDefinition {
 	/**
-	 * Returns the value of the '<em><b>Specified Values</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.EnumValue}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Specified Values</b></em>' containment reference list. The list contents are of
+	 * type {@link org.eclipse.rmf.reqif10.EnumValue}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Specified Values</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Specified Values</em>' containment reference list isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Specified Values</em>' containment reference list.
 	 * @see #isSetSpecifiedValues()
 	 * @see #unsetSpecifiedValues()
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getDatatypeDefinitionEnumeration_SpecifiedValues()
 	 * @model containment="true" unsettable="true"
-	 *        extendedMetaData="name='SPECIFIED-VALUES' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPECIFIED-VALUES' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='SPECIFIED-VALUES' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPECIFIED-VALUES' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	EList<EnumValue> getSpecifiedValues();
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration#getSpecifiedValues <em>Specified Values</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration#getSpecifiedValues
+	 * <em>Specified Values</em>}' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpecifiedValues()
 	 * @see #getSpecifiedValues()
 	 * @generated
@@ -62,9 +60,10 @@
 	void unsetSpecifiedValues();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration#getSpecifiedValues <em>Specified Values</em>}' containment reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '
+	 * {@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration#getSpecifiedValues <em>Specified Values</em>}'
+	 * containment reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Specified Values</em>' containment reference list is set.
 	 * @see #unsetSpecifiedValues()
 	 * @see #getSpecifiedValues()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionInteger.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionInteger.java
index f3c5b5b..aabbad2 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionInteger.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionInteger.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,49 +14,47 @@
 import java.math.BigInteger;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Datatype Definition Integer</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Datatype Definition Integer</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMax <em>Max</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMin <em>Min</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMax <em>Max</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMin <em>Min</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getDatatypeDefinitionInteger()
- * @model extendedMetaData="name='DATATYPE-DEFINITION-INTEGER' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION-INTEGER'"
+ * @model extendedMetaData="name='DATATYPE-DEFINITION-INTEGER' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION-INTEGER'"
  * @generated
  */
 public interface DatatypeDefinitionInteger extends DatatypeDefinitionSimple {
 	/**
-	 * Returns the value of the '<em><b>Max</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Max</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Max</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Max</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Max</em>' attribute.
 	 * @see #isSetMax()
 	 * @see #unsetMax()
 	 * @see #setMax(BigInteger)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getDatatypeDefinitionInteger_Max()
-	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='MAX' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='MAX' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" required="true" ordered="false" extendedMetaData="name='MAX' kind='attribute'"
+	 *        annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='MAX' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	BigInteger getMax();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMax <em>Max</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Max</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Max</em>' attribute.
 	 * @see #isSetMax()
 	 * @see #unsetMax()
 	 * @see #getMax()
@@ -65,9 +63,9 @@
 	void setMax(BigInteger value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMax <em>Max</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMax <em>Max</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetMax()
 	 * @see #getMax()
 	 * @see #setMax(BigInteger)
@@ -76,9 +74,9 @@
 	void unsetMax();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMax <em>Max</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMax <em>Max</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Max</em>' attribute is set.
 	 * @see #unsetMax()
 	 * @see #getMax()
@@ -88,30 +86,30 @@
 	boolean isSetMax();
 
 	/**
-	 * Returns the value of the '<em><b>Min</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Min</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Min</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Min</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Min</em>' attribute.
 	 * @see #isSetMin()
 	 * @see #unsetMin()
 	 * @see #setMin(BigInteger)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getDatatypeDefinitionInteger_Min()
-	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='MIN' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='MIN' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" required="true" ordered="false" extendedMetaData="name='MIN' kind='attribute'"
+	 *        annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='MIN' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	BigInteger getMin();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMin <em>Min</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Min</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Min</em>' attribute.
 	 * @see #isSetMin()
 	 * @see #unsetMin()
 	 * @see #getMin()
@@ -120,9 +118,9 @@
 	void setMin(BigInteger value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMin <em>Min</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMin <em>Min</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetMin()
 	 * @see #getMin()
 	 * @see #setMin(BigInteger)
@@ -131,9 +129,9 @@
 	void unsetMin();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMin <em>Min</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMin <em>Min</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Min</em>' attribute is set.
 	 * @see #unsetMin()
 	 * @see #getMin()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionReal.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionReal.java
index dbbcc80..bbc3350 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionReal.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionReal.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,50 +14,49 @@
 import java.math.BigInteger;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Datatype Definition Real</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Datatype Definition Real</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getAccuracy <em>Accuracy</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMax <em>Max</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMin <em>Min</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getAccuracy <em>Accuracy</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMax <em>Max</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMin <em>Min</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getDatatypeDefinitionReal()
- * @model extendedMetaData="name='DATATYPE-DEFINITION-REAL' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION-REAL'"
+ * @model extendedMetaData="name='DATATYPE-DEFINITION-REAL' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION-REAL'"
  * @generated
  */
 public interface DatatypeDefinitionReal extends DatatypeDefinitionSimple {
 	/**
-	 * Returns the value of the '<em><b>Accuracy</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Accuracy</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Accuracy</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Accuracy</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Accuracy</em>' attribute.
 	 * @see #isSetAccuracy()
 	 * @see #unsetAccuracy()
 	 * @see #setAccuracy(BigInteger)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getDatatypeDefinitionReal_Accuracy()
-	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='ACCURACY' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ACCURACY' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" required="true" ordered="false" extendedMetaData="name='ACCURACY' kind='attribute'"
+	 *        annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ACCURACY' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	BigInteger getAccuracy();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getAccuracy <em>Accuracy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Accuracy</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getAccuracy <em>Accuracy</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Accuracy</em>' attribute.
 	 * @see #isSetAccuracy()
 	 * @see #unsetAccuracy()
 	 * @see #getAccuracy()
@@ -66,9 +65,9 @@
 	void setAccuracy(BigInteger value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getAccuracy <em>Accuracy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getAccuracy <em>Accuracy</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetAccuracy()
 	 * @see #getAccuracy()
 	 * @see #setAccuracy(BigInteger)
@@ -77,9 +76,9 @@
 	void unsetAccuracy();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getAccuracy <em>Accuracy</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getAccuracy
+	 * <em>Accuracy</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Accuracy</em>' attribute is set.
 	 * @see #unsetAccuracy()
 	 * @see #getAccuracy()
@@ -89,30 +88,30 @@
 	boolean isSetAccuracy();
 
 	/**
-	 * Returns the value of the '<em><b>Max</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Max</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Max</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Max</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Max</em>' attribute.
 	 * @see #isSetMax()
 	 * @see #unsetMax()
 	 * @see #setMax(double)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getDatatypeDefinitionReal_Max()
-	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='MAX' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='MAX' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" required="true" ordered="false" extendedMetaData="name='MAX' kind='attribute'"
+	 *        annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='MAX' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	double getMax();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMax <em>Max</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Max</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Max</em>' attribute.
 	 * @see #isSetMax()
 	 * @see #unsetMax()
 	 * @see #getMax()
@@ -122,8 +121,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMax <em>Max</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetMax()
 	 * @see #getMax()
 	 * @see #setMax(double)
@@ -132,9 +131,9 @@
 	void unsetMax();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMax <em>Max</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMax <em>Max</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Max</em>' attribute is set.
 	 * @see #unsetMax()
 	 * @see #getMax()
@@ -144,30 +143,30 @@
 	boolean isSetMax();
 
 	/**
-	 * Returns the value of the '<em><b>Min</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Min</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Min</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Min</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Min</em>' attribute.
 	 * @see #isSetMin()
 	 * @see #unsetMin()
 	 * @see #setMin(double)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getDatatypeDefinitionReal_Min()
-	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='MIN' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='MIN' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" required="true" ordered="false" extendedMetaData="name='MIN' kind='attribute'"
+	 *        annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='MIN' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	double getMin();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMin <em>Min</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Min</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Min</em>' attribute.
 	 * @see #isSetMin()
 	 * @see #unsetMin()
 	 * @see #getMin()
@@ -177,8 +176,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMin <em>Min</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetMin()
 	 * @see #getMin()
 	 * @see #setMin(double)
@@ -187,9 +186,9 @@
 	void unsetMin();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMin <em>Min</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMin <em>Min</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Min</em>' attribute is set.
 	 * @see #unsetMin()
 	 * @see #getMin()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionSimple.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionSimple.java
index a60fd96..2661a60 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionSimple.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionSimple.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,17 +11,13 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Datatype Definition Simple</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Datatype Definition Simple</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getDatatypeDefinitionSimple()
- * @model abstract="true"
- *        extendedMetaData="name='DATATYPE-DEFINITION-SIMPLE' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION-SIMPLE'"
+ * @model abstract="true" extendedMetaData="name='DATATYPE-DEFINITION-SIMPLE' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION-SIMPLE'"
  * @generated
  */
 public interface DatatypeDefinitionSimple extends DatatypeDefinition {
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionString.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionString.java
index 4b7d77c..f405010 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionString.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionString.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,48 +14,47 @@
 import java.math.BigInteger;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Datatype Definition String</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Datatype Definition String</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.DatatypeDefinitionString#getMaxLength <em>Max Length</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.DatatypeDefinitionString#getMaxLength <em>Max Length</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getDatatypeDefinitionString()
- * @model extendedMetaData="name='DATATYPE-DEFINITION-STRING' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION-STRING'"
+ * @model extendedMetaData="name='DATATYPE-DEFINITION-STRING' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION-STRING'"
  * @generated
  */
 public interface DatatypeDefinitionString extends DatatypeDefinitionSimple {
 	/**
-	 * Returns the value of the '<em><b>Max Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Max Length</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Max Length</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Max Length</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Max Length</em>' attribute.
 	 * @see #isSetMaxLength()
 	 * @see #unsetMaxLength()
 	 * @see #setMaxLength(BigInteger)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getDatatypeDefinitionString_MaxLength()
-	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='MAX-LENGTH' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='MAX-LENGTH' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" required="true" ordered="false" extendedMetaData="name='MAX-LENGTH' kind='attribute'"
+	 *        annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='MAX-LENGTH' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	BigInteger getMaxLength();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionString#getMaxLength <em>Max Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Max Length</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionString#getMaxLength <em>Max Length</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Max Length</em>' attribute.
 	 * @see #isSetMaxLength()
 	 * @see #unsetMaxLength()
 	 * @see #getMaxLength()
@@ -64,9 +63,9 @@
 	void setMaxLength(BigInteger value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionString#getMaxLength <em>Max Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionString#getMaxLength
+	 * <em>Max Length</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetMaxLength()
 	 * @see #getMaxLength()
 	 * @see #setMaxLength(BigInteger)
@@ -75,9 +74,9 @@
 	void unsetMaxLength();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionString#getMaxLength <em>Max Length</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionString#getMaxLength
+	 * <em>Max Length</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Max Length</em>' attribute is set.
 	 * @see #unsetMaxLength()
 	 * @see #getMaxLength()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionXHTML.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionXHTML.java
index 0ba4e02..82f0960 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionXHTML.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/DatatypeDefinitionXHTML.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,16 +11,13 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Datatype Definition XHTML</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Datatype Definition XHTML</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getDatatypeDefinitionXHTML()
- * @model extendedMetaData="name='DATATYPE-DEFINITION-XHTML' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION-XHTML'"
+ * @model extendedMetaData="name='DATATYPE-DEFINITION-XHTML' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPE-DEFINITION-XHTML'"
  * @generated
  */
 public interface DatatypeDefinitionXHTML extends DatatypeDefinition {
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/EmbeddedValue.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/EmbeddedValue.java
index 4a45430..ab9294e 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/EmbeddedValue.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/EmbeddedValue.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,49 +16,46 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Embedded Value</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Embedded Value</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.EmbeddedValue#getKey <em>Key</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.EmbeddedValue#getOtherContent <em>Other Content</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.EmbeddedValue#getKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.EmbeddedValue#getOtherContent <em>Other Content</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getEmbeddedValue()
- * @model extendedMetaData="name='EMBEDDED-VALUE' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='EMBEDDED-VALUE'"
+ * @model extendedMetaData="name='EMBEDDED-VALUE' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='EMBEDDED-VALUE'"
  * @generated
  */
 public interface EmbeddedValue extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Key</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Key</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Key</em>' attribute.
 	 * @see #isSetKey()
 	 * @see #unsetKey()
 	 * @see #setKey(BigInteger)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getEmbeddedValue_Key()
-	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='KEY' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='KEY' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" required="true" ordered="false" extendedMetaData="name='KEY' kind='attribute'"
+	 *        annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='KEY' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	BigInteger getKey();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.EmbeddedValue#getKey <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Key</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.EmbeddedValue#getKey <em>Key</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Key</em>' attribute.
 	 * @see #isSetKey()
 	 * @see #unsetKey()
 	 * @see #getKey()
@@ -67,9 +64,9 @@
 	void setKey(BigInteger value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.EmbeddedValue#getKey <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.EmbeddedValue#getKey <em>Key</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetKey()
 	 * @see #getKey()
 	 * @see #setKey(BigInteger)
@@ -78,9 +75,9 @@
 	void unsetKey();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.EmbeddedValue#getKey <em>Key</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.EmbeddedValue#getKey <em>Key</em>}' attribute is
+	 * set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Key</em>' attribute is set.
 	 * @see #unsetKey()
 	 * @see #getKey()
@@ -90,30 +87,31 @@
 	boolean isSetKey();
 
 	/**
-	 * Returns the value of the '<em><b>Other Content</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Other Content</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Other Content</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Other Content</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Other Content</em>' attribute.
 	 * @see #isSetOtherContent()
 	 * @see #unsetOtherContent()
 	 * @see #setOtherContent(String)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getEmbeddedValue_OtherContent()
-	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='OTHER-CONTENT' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='OTHER-CONTENT' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" required="true" ordered="false" extendedMetaData="name='OTHER-CONTENT' kind='attribute'"
+	 *        annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='OTHER-CONTENT' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	String getOtherContent();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.EmbeddedValue#getOtherContent <em>Other Content</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Other Content</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.EmbeddedValue#getOtherContent <em>Other Content</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Other Content</em>' attribute.
 	 * @see #isSetOtherContent()
 	 * @see #unsetOtherContent()
 	 * @see #getOtherContent()
@@ -122,9 +120,9 @@
 	void setOtherContent(String value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.EmbeddedValue#getOtherContent <em>Other Content</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.EmbeddedValue#getOtherContent <em>Other Content</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetOtherContent()
 	 * @see #getOtherContent()
 	 * @see #setOtherContent(String)
@@ -133,9 +131,9 @@
 	void unsetOtherContent();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.EmbeddedValue#getOtherContent <em>Other Content</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.EmbeddedValue#getOtherContent
+	 * <em>Other Content</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Other Content</em>' attribute is set.
 	 * @see #unsetOtherContent()
 	 * @see #getOtherContent()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/EnumValue.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/EnumValue.java
index 5b11aaf..1a8bf6f 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/EnumValue.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/EnumValue.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,50 +11,47 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Enum Value</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Enum Value</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.EnumValue#getProperties <em>Properties</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.EnumValue#getProperties <em>Properties</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getEnumValue()
- * @model extendedMetaData="name='ENUM-VALUE' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ENUM-VALUE'"
+ * @model extendedMetaData="name='ENUM-VALUE' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ENUM-VALUE'"
  * @generated
  */
 public interface EnumValue extends Identifiable {
 	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Properties</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Properties</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Properties</em>' containment reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Properties</em>' containment reference.
 	 * @see #isSetProperties()
 	 * @see #unsetProperties()
 	 * @see #setProperties(EmbeddedValue)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getEnumValue_Properties()
 	 * @model containment="true" unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='PROPERTIES' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='PROPERTIES' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='PROPERTIES' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='PROPERTIES' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	EmbeddedValue getProperties();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.EnumValue#getProperties <em>Properties</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Properties</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.EnumValue#getProperties <em>Properties</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Properties</em>' containment reference.
 	 * @see #isSetProperties()
 	 * @see #unsetProperties()
 	 * @see #getProperties()
@@ -63,9 +60,9 @@
 	void setProperties(EmbeddedValue value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.EnumValue#getProperties <em>Properties</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.EnumValue#getProperties <em>Properties</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetProperties()
 	 * @see #getProperties()
 	 * @see #setProperties(EmbeddedValue)
@@ -74,9 +71,9 @@
 	void unsetProperties();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.EnumValue#getProperties <em>Properties</em>}' containment reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.EnumValue#getProperties <em>Properties</em>}'
+	 * containment reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Properties</em>' containment reference is set.
 	 * @see #unsetProperties()
 	 * @see #getProperties()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/Identifiable.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/Identifiable.java
index 9e45864..8f721d3 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/Identifiable.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/Identifiable.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,58 +12,52 @@
 package org.eclipse.rmf.reqif10;
 
 import java.util.GregorianCalendar;
-import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Identifiable</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Identifiable</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.Identifiable#getDesc <em>Desc</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.Identifiable#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.Identifiable#getLastChange <em>Last Change</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.Identifiable#getLongName <em>Long Name</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.Identifiable#getAlternativeID <em>Alternative ID</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.Identifiable#getDesc <em>Desc</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.Identifiable#getIdentifier <em>Identifier</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.Identifiable#getLastChange <em>Last Change</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.Identifiable#getLongName <em>Long Name</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.Identifiable#getAlternativeID <em>Alternative ID</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getIdentifiable()
- * @model abstract="true"
- *        extendedMetaData="name='IDENTIFIABLE' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='IDENTIFIABLE'"
+ * @model abstract="true" extendedMetaData="name='IDENTIFIABLE' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='IDENTIFIABLE'"
  * @generated
  */
 public interface Identifiable extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Desc</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Desc</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Desc</em>' attribute.
 	 * @see #isSetDesc()
 	 * @see #unsetDesc()
 	 * @see #setDesc(String)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getIdentifiable_Desc()
-	 * @model unsettable="true" ordered="false"
-	 *        extendedMetaData="name='DESC' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DESC' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" ordered="false" extendedMetaData="name='DESC' kind='attribute'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DESC' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	String getDesc();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getDesc <em>Desc</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Desc</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getDesc <em>Desc</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Desc</em>' attribute.
 	 * @see #isSetDesc()
 	 * @see #unsetDesc()
 	 * @see #getDesc()
@@ -72,9 +66,9 @@
 	void setDesc(String value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getDesc <em>Desc</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getDesc <em>Desc</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDesc()
 	 * @see #getDesc()
 	 * @see #setDesc(String)
@@ -83,9 +77,9 @@
 	void unsetDesc();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getDesc <em>Desc</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getDesc <em>Desc</em>}' attribute
+	 * is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Desc</em>' attribute is set.
 	 * @see #unsetDesc()
 	 * @see #getDesc()
@@ -95,30 +89,31 @@
 	boolean isSetDesc();
 
 	/**
-	 * Returns the value of the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Identifier</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Identifier</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Identifier</em>' attribute.
 	 * @see #isSetIdentifier()
 	 * @see #unsetIdentifier()
 	 * @see #setIdentifier(String)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getIdentifiable_Identifier()
 	 * @model unsettable="true" id="true" dataType="org.eclipse.rmf.reqif10.ID" required="true" ordered="false"
-	 *        extendedMetaData="name='IDENTIFIER' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='IDENTIFIER' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 *        extendedMetaData="name='IDENTIFIER' kind='attribute'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='IDENTIFIER' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	String getIdentifier();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getIdentifier <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Identifier</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Identifier</em>' attribute.
 	 * @see #isSetIdentifier()
 	 * @see #unsetIdentifier()
 	 * @see #getIdentifier()
@@ -127,9 +122,9 @@
 	void setIdentifier(String value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getIdentifier <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getIdentifier <em>Identifier</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetIdentifier()
 	 * @see #getIdentifier()
 	 * @see #setIdentifier(String)
@@ -138,9 +133,9 @@
 	void unsetIdentifier();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getIdentifier <em>Identifier</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getIdentifier <em>Identifier</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Identifier</em>' attribute is set.
 	 * @see #unsetIdentifier()
 	 * @see #getIdentifier()
@@ -150,30 +145,31 @@
 	boolean isSetIdentifier();
 
 	/**
-	 * Returns the value of the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Last Change</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Last Change</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Last Change</em>' attribute.
 	 * @see #isSetLastChange()
 	 * @see #unsetLastChange()
 	 * @see #setLastChange(GregorianCalendar)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getIdentifiable_LastChange()
 	 * @model unsettable="true" dataType="org.eclipse.rmf.reqif10.DateTime" required="true" ordered="false"
-	 *        extendedMetaData="name='LAST-CHANGE' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='LAST-CHANGE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 *        extendedMetaData="name='LAST-CHANGE' kind='attribute'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='LAST-CHANGE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	GregorianCalendar getLastChange();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getLastChange <em>Last Change</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Last Change</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getLastChange <em>Last Change</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Last Change</em>' attribute.
 	 * @see #isSetLastChange()
 	 * @see #unsetLastChange()
 	 * @see #getLastChange()
@@ -182,9 +178,9 @@
 	void setLastChange(GregorianCalendar value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getLastChange <em>Last Change</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getLastChange <em>Last Change</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetLastChange()
 	 * @see #getLastChange()
 	 * @see #setLastChange(GregorianCalendar)
@@ -193,9 +189,9 @@
 	void unsetLastChange();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getLastChange <em>Last Change</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getLastChange <em>Last Change</em>}
+	 * ' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Last Change</em>' attribute is set.
 	 * @see #unsetLastChange()
 	 * @see #getLastChange()
@@ -205,30 +201,30 @@
 	boolean isSetLastChange();
 
 	/**
-	 * Returns the value of the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Long Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Long Name</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Long Name</em>' attribute.
 	 * @see #isSetLongName()
 	 * @see #unsetLongName()
 	 * @see #setLongName(String)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getIdentifiable_LongName()
-	 * @model unsettable="true" ordered="false"
-	 *        extendedMetaData="name='LONG-NAME' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='LONG-NAME' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" ordered="false" extendedMetaData="name='LONG-NAME' kind='attribute'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='LONG-NAME' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	String getLongName();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getLongName <em>Long Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Long Name</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Long Name</em>' attribute.
 	 * @see #isSetLongName()
 	 * @see #unsetLongName()
 	 * @see #getLongName()
@@ -238,8 +234,8 @@
 
 	/**
 	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getLongName <em>Long Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetLongName()
 	 * @see #getLongName()
 	 * @see #setLongName(String)
@@ -248,9 +244,9 @@
 	void unsetLongName();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getLongName <em>Long Name</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getLongName <em>Long Name</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Long Name</em>' attribute is set.
 	 * @see #unsetLongName()
 	 * @see #getLongName()
@@ -260,30 +256,31 @@
 	boolean isSetLongName();
 
 	/**
-	 * Returns the value of the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Alternative ID</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Alternative ID</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Alternative ID</em>' containment reference.
 	 * @see #isSetAlternativeID()
 	 * @see #unsetAlternativeID()
 	 * @see #setAlternativeID(AlternativeID)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getIdentifiable_AlternativeID()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='ALTERNATIVE-ID' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ALTERNATIVE-ID' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='ALTERNATIVE-ID' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='ALTERNATIVE-ID' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	AlternativeID getAlternativeID();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getAlternativeID <em>Alternative ID</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Alternative ID</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getAlternativeID <em>Alternative ID</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Alternative ID</em>' containment reference.
 	 * @see #isSetAlternativeID()
 	 * @see #unsetAlternativeID()
 	 * @see #getAlternativeID()
@@ -292,9 +289,9 @@
 	void setAlternativeID(AlternativeID value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getAlternativeID <em>Alternative ID</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getAlternativeID <em>Alternative ID</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetAlternativeID()
 	 * @see #getAlternativeID()
 	 * @see #setAlternativeID(AlternativeID)
@@ -303,9 +300,9 @@
 	void unsetAlternativeID();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getAlternativeID <em>Alternative ID</em>}' containment reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.Identifiable#getAlternativeID
+	 * <em>Alternative ID</em>}' containment reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Alternative ID</em>' containment reference is set.
 	 * @see #unsetAlternativeID()
 	 * @see #getAlternativeID()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/RelationGroup.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/RelationGroup.java
index 29cfd91..42ff109 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/RelationGroup.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/RelationGroup.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,50 +14,47 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Relation Group</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Relation Group</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.RelationGroup#getSpecRelations <em>Spec Relations</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.RelationGroup#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.RelationGroup#getSourceSpecification <em>Source Specification</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.RelationGroup#getTargetSpecification <em>Target Specification</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.RelationGroup#getSpecRelations <em>Spec Relations</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.RelationGroup#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.RelationGroup#getSourceSpecification <em>Source Specification</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.RelationGroup#getTargetSpecification <em>Target Specification</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getRelationGroup()
- * @model extendedMetaData="name='RELATION-GROUP' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='RELATION-GROUP'"
+ * @model extendedMetaData="name='RELATION-GROUP' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='RELATION-GROUP'"
  * @generated
  */
 public interface RelationGroup extends Identifiable {
 	/**
-	 * Returns the value of the '<em><b>Spec Relations</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.SpecRelation}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Spec Relations</b></em>' reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.SpecRelation}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Spec Relations</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Spec Relations</em>' reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Spec Relations</em>' reference list.
 	 * @see #isSetSpecRelations()
 	 * @see #unsetSpecRelations()
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getRelationGroup_SpecRelations()
 	 * @model unsettable="true" ordered="false"
-	 *        extendedMetaData="name='SPEC-RELATIONS' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-RELATIONS' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='SPEC-RELATIONS' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-RELATIONS' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	EList<SpecRelation> getSpecRelations();
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getSpecRelations <em>Spec Relations</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getSpecRelations <em>Spec Relations</em>}'
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpecRelations()
 	 * @see #getSpecRelations()
 	 * @generated
@@ -65,9 +62,9 @@
 	void unsetSpecRelations();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getSpecRelations <em>Spec Relations</em>}' reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getSpecRelations
+	 * <em>Spec Relations</em>}' reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Spec Relations</em>' reference list is set.
 	 * @see #unsetSpecRelations()
 	 * @see #getSpecRelations()
@@ -76,30 +73,30 @@
 	boolean isSetSpecRelations();
 
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #setType(RelationGroupType)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getRelationGroup_Type()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	RelationGroupType getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getType <em>Type</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #getType()
@@ -108,9 +105,9 @@
 	void setType(RelationGroupType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getType <em>Type</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetType()
 	 * @see #getType()
 	 * @see #setType(RelationGroupType)
@@ -119,9 +116,9 @@
 	void unsetType();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getType <em>Type</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getType <em>Type</em>}' reference
+	 * is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Type</em>' reference is set.
 	 * @see #unsetType()
 	 * @see #getType()
@@ -131,30 +128,31 @@
 	boolean isSetType();
 
 	/**
-	 * Returns the value of the '<em><b>Source Specification</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Source Specification</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Source Specification</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Source Specification</em>' reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Source Specification</em>' reference.
 	 * @see #isSetSourceSpecification()
 	 * @see #unsetSourceSpecification()
 	 * @see #setSourceSpecification(Specification)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getRelationGroup_SourceSpecification()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='SOURCE-SPECIFICATION' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SOURCE-SPECIFICATION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='SOURCE-SPECIFICATION' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SOURCE-SPECIFICATION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	Specification getSourceSpecification();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getSourceSpecification <em>Source Specification</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source Specification</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getSourceSpecification
+	 * <em>Source Specification</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Source Specification</em>' reference.
 	 * @see #isSetSourceSpecification()
 	 * @see #unsetSourceSpecification()
 	 * @see #getSourceSpecification()
@@ -163,9 +161,9 @@
 	void setSourceSpecification(Specification value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getSourceSpecification <em>Source Specification</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getSourceSpecification
+	 * <em>Source Specification</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSourceSpecification()
 	 * @see #getSourceSpecification()
 	 * @see #setSourceSpecification(Specification)
@@ -174,9 +172,9 @@
 	void unsetSourceSpecification();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getSourceSpecification <em>Source Specification</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getSourceSpecification
+	 * <em>Source Specification</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Source Specification</em>' reference is set.
 	 * @see #unsetSourceSpecification()
 	 * @see #getSourceSpecification()
@@ -186,30 +184,31 @@
 	boolean isSetSourceSpecification();
 
 	/**
-	 * Returns the value of the '<em><b>Target Specification</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Target Specification</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target Specification</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Target Specification</em>' reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target Specification</em>' reference.
 	 * @see #isSetTargetSpecification()
 	 * @see #unsetTargetSpecification()
 	 * @see #setTargetSpecification(Specification)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getRelationGroup_TargetSpecification()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='TARGET-SPECIFICATION' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TARGET-SPECIFICATION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='TARGET-SPECIFICATION' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TARGET-SPECIFICATION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	Specification getTargetSpecification();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getTargetSpecification <em>Target Specification</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Specification</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getTargetSpecification
+	 * <em>Target Specification</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Target Specification</em>' reference.
 	 * @see #isSetTargetSpecification()
 	 * @see #unsetTargetSpecification()
 	 * @see #getTargetSpecification()
@@ -218,9 +217,9 @@
 	void setTargetSpecification(Specification value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getTargetSpecification <em>Target Specification</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getTargetSpecification
+	 * <em>Target Specification</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetTargetSpecification()
 	 * @see #getTargetSpecification()
 	 * @see #setTargetSpecification(Specification)
@@ -229,9 +228,9 @@
 	void unsetTargetSpecification();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getTargetSpecification <em>Target Specification</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.RelationGroup#getTargetSpecification
+	 * <em>Target Specification</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Target Specification</em>' reference is set.
 	 * @see #unsetTargetSpecification()
 	 * @see #getTargetSpecification()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/RelationGroupType.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/RelationGroupType.java
index a0cee80..4b29558 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/RelationGroupType.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/RelationGroupType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,16 +11,13 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Relation Group Type</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Relation Group Type</b></em>'. <!-- end-user-doc
+ * -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getRelationGroupType()
- * @model extendedMetaData="name='RELATION-GROUP-TYPE' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='RELATION-GROUP-TYPE'"
+ * @model extendedMetaData="name='RELATION-GROUP-TYPE' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='RELATION-GROUP-TYPE'"
  * @generated
  */
 public interface RelationGroupType extends SpecType {
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIF.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIF.java
index 0f9836b..a9a7838 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIF.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIF.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,38 +12,33 @@
 package org.eclipse.rmf.reqif10;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Req IF</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Req IF</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIF#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIF#getTheHeader <em>The Header</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIF#getCoreContent <em>Core Content</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIF#getToolExtensions <em>Tool Extensions</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIF#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIF#getTheHeader <em>The Header</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIF#getCoreContent <em>Core Content</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIF#getToolExtensions <em>Tool Extensions</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIF()
- * @model extendedMetaData="name='REQ-IF' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='REQ-IF'"
+ * @model extendedMetaData="name='REQ-IF' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='REQ-IF'"
  * @generated
  */
 public interface ReqIF extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Lang</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Lang</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Lang</em>' attribute.
 	 * @see #isSetLang()
 	 * @see #unsetLang()
@@ -56,10 +51,11 @@
 	String getLang();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Lang</em>' attribute.
 	 * @see #isSetLang()
 	 * @see #unsetLang()
 	 * @see #getLang()
@@ -68,9 +64,9 @@
 	void setLang(String value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getLang <em>Lang</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetLang()
 	 * @see #getLang()
 	 * @see #setLang(String)
@@ -80,8 +76,8 @@
 
 	/**
 	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getLang <em>Lang</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Lang</em>' attribute is set.
 	 * @see #unsetLang()
 	 * @see #getLang()
@@ -91,30 +87,31 @@
 	boolean isSetLang();
 
 	/**
-	 * Returns the value of the '<em><b>The Header</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>The Header</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>The Header</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>The Header</em>' containment reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>The Header</em>' containment reference.
 	 * @see #isSetTheHeader()
 	 * @see #unsetTheHeader()
 	 * @see #setTheHeader(ReqIFHeader)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIF_TheHeader()
 	 * @model containment="true" unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='THE-HEADER' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='THE-HEADER' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='THE-HEADER' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='THE-HEADER' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	ReqIFHeader getTheHeader();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getTheHeader <em>The Header</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>The Header</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getTheHeader <em>The Header</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>The Header</em>' containment reference.
 	 * @see #isSetTheHeader()
 	 * @see #unsetTheHeader()
 	 * @see #getTheHeader()
@@ -123,9 +120,9 @@
 	void setTheHeader(ReqIFHeader value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getTheHeader <em>The Header</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getTheHeader <em>The Header</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetTheHeader()
 	 * @see #getTheHeader()
 	 * @see #setTheHeader(ReqIFHeader)
@@ -134,9 +131,9 @@
 	void unsetTheHeader();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getTheHeader <em>The Header</em>}' containment reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getTheHeader <em>The Header</em>}'
+	 * containment reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>The Header</em>' containment reference is set.
 	 * @see #unsetTheHeader()
 	 * @see #getTheHeader()
@@ -146,30 +143,31 @@
 	boolean isSetTheHeader();
 
 	/**
-	 * Returns the value of the '<em><b>Core Content</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Core Content</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Core Content</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Core Content</em>' containment reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Core Content</em>' containment reference.
 	 * @see #isSetCoreContent()
 	 * @see #unsetCoreContent()
 	 * @see #setCoreContent(ReqIFContent)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIF_CoreContent()
 	 * @model containment="true" unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='CORE-CONTENT' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='CORE-CONTENT' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='CORE-CONTENT' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='CORE-CONTENT' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	ReqIFContent getCoreContent();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getCoreContent <em>Core Content</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Core Content</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getCoreContent <em>Core Content</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Core Content</em>' containment reference.
 	 * @see #isSetCoreContent()
 	 * @see #unsetCoreContent()
 	 * @see #getCoreContent()
@@ -178,9 +176,9 @@
 	void setCoreContent(ReqIFContent value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getCoreContent <em>Core Content</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getCoreContent <em>Core Content</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetCoreContent()
 	 * @see #getCoreContent()
 	 * @see #setCoreContent(ReqIFContent)
@@ -189,9 +187,9 @@
 	void unsetCoreContent();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getCoreContent <em>Core Content</em>}' containment reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getCoreContent <em>Core Content</em>}'
+	 * containment reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Core Content</em>' containment reference is set.
 	 * @see #unsetCoreContent()
 	 * @see #getCoreContent()
@@ -201,29 +199,29 @@
 	boolean isSetCoreContent();
 
 	/**
-	 * Returns the value of the '<em><b>Tool Extensions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.ReqIFToolExtension}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Tool Extensions</b></em>' containment reference list. The list contents are of
+	 * type {@link org.eclipse.rmf.reqif10.ReqIFToolExtension}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Tool Extensions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Tool Extensions</em>' containment reference list isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Tool Extensions</em>' containment reference list.
 	 * @see #isSetToolExtensions()
 	 * @see #unsetToolExtensions()
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIF_ToolExtensions()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='TOOL-EXTENSIONS' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TOOL-EXTENSIONS' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='TOOL-EXTENSIONS' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TOOL-EXTENSIONS' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	EList<ReqIFToolExtension> getToolExtensions();
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getToolExtensions <em>Tool Extensions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getToolExtensions <em>Tool Extensions</em>}'
+	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetToolExtensions()
 	 * @see #getToolExtensions()
 	 * @generated
@@ -231,9 +229,9 @@
 	void unsetToolExtensions();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getToolExtensions <em>Tool Extensions</em>}' containment reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIF#getToolExtensions
+	 * <em>Tool Extensions</em>}' containment reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Tool Extensions</em>' containment reference list is set.
 	 * @see #unsetToolExtensions()
 	 * @see #getToolExtensions()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIF10Factory.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIF10Factory.java
index 55b5b59..c321b59 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIF10Factory.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIF10Factory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,371 +14,340 @@
 import org.eclipse.emf.ecore.EFactory;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
+ * the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package
  * @generated
  */
 public interface ReqIF10Factory extends EFactory {
 	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	ReqIF10Factory eINSTANCE = org.eclipse.rmf.reqif10.impl.ReqIF10FactoryImpl.init();
 
 	/**
-	 * Returns a new object of class '<em>Attribute Value XHTML</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Attribute Value XHTML</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Attribute Value XHTML</em>'.
 	 * @generated
 	 */
 	AttributeValueXHTML createAttributeValueXHTML();
 
 	/**
-	 * Returns a new object of class '<em>Attribute Definition XHTML</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Attribute Definition XHTML</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Attribute Definition XHTML</em>'.
 	 * @generated
 	 */
 	AttributeDefinitionXHTML createAttributeDefinitionXHTML();
 
 	/**
-	 * Returns a new object of class '<em>Req IF Content</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Req IF Content</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Req IF Content</em>'.
 	 * @generated
 	 */
 	ReqIFContent createReqIFContent();
 
 	/**
-	 * Returns a new object of class '<em>Req IF</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Req IF</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Req IF</em>'.
 	 * @generated
 	 */
 	ReqIF createReqIF();
 
 	/**
-	 * Returns a new object of class '<em>Req IF Header</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Req IF Header</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Req IF Header</em>'.
 	 * @generated
 	 */
 	ReqIFHeader createReqIFHeader();
 
 	/**
-	 * Returns a new object of class '<em>Req IF Tool Extension</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Req IF Tool Extension</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Req IF Tool Extension</em>'.
 	 * @generated
 	 */
 	ReqIFToolExtension createReqIFToolExtension();
 
 	/**
-	 * Returns a new object of class '<em>Spec Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Spec Object</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Spec Object</em>'.
 	 * @generated
 	 */
 	SpecObject createSpecObject();
 
 	/**
-	 * Returns a new object of class '<em>Spec Object Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Spec Object Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Spec Object Type</em>'.
 	 * @generated
 	 */
 	SpecObjectType createSpecObjectType();
 
 	/**
-	 * Returns a new object of class '<em>Specification</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Specification</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Specification</em>'.
 	 * @generated
 	 */
 	Specification createSpecification();
 
 	/**
-	 * Returns a new object of class '<em>Specification Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Specification Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Specification Type</em>'.
 	 * @generated
 	 */
 	SpecificationType createSpecificationType();
 
 	/**
-	 * Returns a new object of class '<em>Spec Hierarchy</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Spec Hierarchy</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Spec Hierarchy</em>'.
 	 * @generated
 	 */
 	SpecHierarchy createSpecHierarchy();
 
 	/**
-	 * Returns a new object of class '<em>Spec Relation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Spec Relation</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Spec Relation</em>'.
 	 * @generated
 	 */
 	SpecRelation createSpecRelation();
 
 	/**
-	 * Returns a new object of class '<em>Spec Relation Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Spec Relation Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Spec Relation Type</em>'.
 	 * @generated
 	 */
 	SpecRelationType createSpecRelationType();
 
 	/**
-	 * Returns a new object of class '<em>Relation Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Relation Group</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Relation Group</em>'.
 	 * @generated
 	 */
 	RelationGroup createRelationGroup();
 
 	/**
-	 * Returns a new object of class '<em>Relation Group Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Relation Group Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Relation Group Type</em>'.
 	 * @generated
 	 */
 	RelationGroupType createRelationGroupType();
 
 	/**
-	 * Returns a new object of class '<em>Datatype Definition XHTML</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Datatype Definition XHTML</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Datatype Definition XHTML</em>'.
 	 * @generated
 	 */
 	DatatypeDefinitionXHTML createDatatypeDefinitionXHTML();
 
 	/**
-	 * Returns a new object of class '<em>Alternative ID</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Alternative ID</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Alternative ID</em>'.
 	 * @generated
 	 */
 	AlternativeID createAlternativeID();
 
 	/**
-	 * Returns a new object of class '<em>Attribute Definition Boolean</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Attribute Definition Boolean</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Attribute Definition Boolean</em>'.
 	 * @generated
 	 */
 	AttributeDefinitionBoolean createAttributeDefinitionBoolean();
 
 	/**
-	 * Returns a new object of class '<em>Datatype Definition Boolean</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Datatype Definition Boolean</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Datatype Definition Boolean</em>'.
 	 * @generated
 	 */
 	DatatypeDefinitionBoolean createDatatypeDefinitionBoolean();
 
 	/**
-	 * Returns a new object of class '<em>Attribute Value Boolean</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Attribute Value Boolean</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Attribute Value Boolean</em>'.
 	 * @generated
 	 */
 	AttributeValueBoolean createAttributeValueBoolean();
 
 	/**
-	 * Returns a new object of class '<em>Attribute Definition Date</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Attribute Definition Date</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Attribute Definition Date</em>'.
 	 * @generated
 	 */
 	AttributeDefinitionDate createAttributeDefinitionDate();
 
 	/**
-	 * Returns a new object of class '<em>Datatype Definition Date</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Datatype Definition Date</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Datatype Definition Date</em>'.
 	 * @generated
 	 */
 	DatatypeDefinitionDate createDatatypeDefinitionDate();
 
 	/**
-	 * Returns a new object of class '<em>Attribute Value Date</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Attribute Value Date</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Attribute Value Date</em>'.
 	 * @generated
 	 */
 	AttributeValueDate createAttributeValueDate();
 
 	/**
-	 * Returns a new object of class '<em>Attribute Definition Enumeration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Attribute Definition Enumeration</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Attribute Definition Enumeration</em>'.
 	 * @generated
 	 */
 	AttributeDefinitionEnumeration createAttributeDefinitionEnumeration();
 
 	/**
-	 * Returns a new object of class '<em>Datatype Definition Enumeration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Datatype Definition Enumeration</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Datatype Definition Enumeration</em>'.
 	 * @generated
 	 */
 	DatatypeDefinitionEnumeration createDatatypeDefinitionEnumeration();
 
 	/**
-	 * Returns a new object of class '<em>Enum Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Enum Value</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Enum Value</em>'.
 	 * @generated
 	 */
 	EnumValue createEnumValue();
 
 	/**
-	 * Returns a new object of class '<em>Embedded Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Embedded Value</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Embedded Value</em>'.
 	 * @generated
 	 */
 	EmbeddedValue createEmbeddedValue();
 
 	/**
-	 * Returns a new object of class '<em>Attribute Value Enumeration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Attribute Value Enumeration</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Attribute Value Enumeration</em>'.
 	 * @generated
 	 */
 	AttributeValueEnumeration createAttributeValueEnumeration();
 
 	/**
-	 * Returns a new object of class '<em>Attribute Definition Integer</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Attribute Definition Integer</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Attribute Definition Integer</em>'.
 	 * @generated
 	 */
 	AttributeDefinitionInteger createAttributeDefinitionInteger();
 
 	/**
-	 * Returns a new object of class '<em>Datatype Definition Integer</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Datatype Definition Integer</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Datatype Definition Integer</em>'.
 	 * @generated
 	 */
 	DatatypeDefinitionInteger createDatatypeDefinitionInteger();
 
 	/**
-	 * Returns a new object of class '<em>Attribute Value Integer</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Attribute Value Integer</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Attribute Value Integer</em>'.
 	 * @generated
 	 */
 	AttributeValueInteger createAttributeValueInteger();
 
 	/**
-	 * Returns a new object of class '<em>Attribute Definition Real</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Attribute Definition Real</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Attribute Definition Real</em>'.
 	 * @generated
 	 */
 	AttributeDefinitionReal createAttributeDefinitionReal();
 
 	/**
-	 * Returns a new object of class '<em>Datatype Definition Real</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Datatype Definition Real</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Datatype Definition Real</em>'.
 	 * @generated
 	 */
 	DatatypeDefinitionReal createDatatypeDefinitionReal();
 
 	/**
-	 * Returns a new object of class '<em>Attribute Value Real</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Attribute Value Real</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Attribute Value Real</em>'.
 	 * @generated
 	 */
 	AttributeValueReal createAttributeValueReal();
 
 	/**
-	 * Returns a new object of class '<em>Attribute Definition String</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Attribute Definition String</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Attribute Definition String</em>'.
 	 * @generated
 	 */
 	AttributeDefinitionString createAttributeDefinitionString();
 
 	/**
-	 * Returns a new object of class '<em>Datatype Definition String</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Datatype Definition String</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Datatype Definition String</em>'.
 	 * @generated
 	 */
 	DatatypeDefinitionString createDatatypeDefinitionString();
 
 	/**
-	 * Returns a new object of class '<em>Attribute Value String</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Attribute Value String</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Attribute Value String</em>'.
 	 * @generated
 	 */
 	AttributeValueString createAttributeValueString();
 
 	/**
-	 * Returns a new object of class '<em>Xhtml Content</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Xhtml Content</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Xhtml Content</em>'.
 	 * @generated
 	 */
 	XhtmlContent createXhtmlContent();
 
 	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
 	ReqIF10Package getReqIF10Package();
 
-} //ReqIF10Factory
+} // ReqIF10Factory
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIF10Package.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIF10Package.java
index 4c38fb6..2abfca1 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIF10Package.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIF10Package.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,65 +18,59 @@
 import org.eclipse.emf.ecore.EReference;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
+ * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Factory
  * @model kind="package"
  * @generated
  */
 public interface ReqIF10Package extends EPackage {
 	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	String eNAME = "reqif10";
+	String eNAME = "reqif10"; //$NON-NLS-1$
 
 	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	String eNS_URI = "http://www.omg.org/spec/ReqIF/20110401/reqif.xsd";
+	String eNS_URI = "http://www.omg.org/spec/ReqIF/20110401/reqif.xsd"; //$NON-NLS-1$
 
 	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	String eNS_PREFIX = "reqif";
+	String eNS_PREFIX = "reqif"; //$NON-NLS-1$
 
 	/**
-	 * The package content type ID.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package content type ID. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	String eCONTENT_TYPE = "org.eclipse.rmf.reqif10.reqif10XMLFile";
+	String eCONTENT_TYPE = "org.eclipse.rmf.reqif10.reqif10XMLFile"; //$NON-NLS-1$
 
 	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	ReqIF10Package eINSTANCE = org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl.init();
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.IdentifiableImpl <em>Identifiable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.IdentifiableImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getIdentifiable()
 	 * @generated
@@ -84,63 +78,59 @@
 	int IDENTIFIABLE = 1;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IDENTIFIABLE__DESC = 0;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IDENTIFIABLE__IDENTIFIER = 1;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IDENTIFIABLE__LAST_CHANGE = 2;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IDENTIFIABLE__LONG_NAME = 3;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IDENTIFIABLE__ALTERNATIVE_ID = 4;
 
 	/**
-	 * The number of structural features of the '<em>Identifiable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Identifiable</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IDENTIFIABLE_FEATURE_COUNT = 5;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AccessControlledElementImpl <em>Access Controlled Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AccessControlledElementImpl
+	 * <em>Access Controlled Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AccessControlledElementImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAccessControlledElement()
 	 * @generated
@@ -148,72 +138,67 @@
 	int ACCESS_CONTROLLED_ELEMENT = 0;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ACCESS_CONTROLLED_ELEMENT__DESC = IDENTIFIABLE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ACCESS_CONTROLLED_ELEMENT__IDENTIFIER = IDENTIFIABLE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ACCESS_CONTROLLED_ELEMENT__LAST_CHANGE = IDENTIFIABLE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ACCESS_CONTROLLED_ELEMENT__LONG_NAME = IDENTIFIABLE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ACCESS_CONTROLLED_ELEMENT__ALTERNATIVE_ID = IDENTIFIABLE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Editable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Editable</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ACCESS_CONTROLLED_ELEMENT__EDITABLE = IDENTIFIABLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Access Controlled Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Access Controlled Element</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ACCESS_CONTROLLED_ELEMENT_FEATURE_COUNT = IDENTIFIABLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueImpl <em>Attribute Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueImpl <em>Attribute Value</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeValueImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValue()
 	 * @generated
@@ -221,18 +206,18 @@
 	int ATTRIBUTE_VALUE = 3;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Value</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Attribute Value</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_FEATURE_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueXHTMLImpl <em>Attribute Value XHTML</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueXHTMLImpl
+	 * <em>Attribute Value XHTML</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeValueXHTMLImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValueXHTML()
 	 * @generated
@@ -240,54 +225,52 @@
 	int ATTRIBUTE_VALUE_XHTML = 2;
 
 	/**
-	 * The feature id for the '<em><b>Simplified</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Simplified</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_XHTML__SIMPLIFIED = ATTRIBUTE_VALUE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Definition</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_XHTML__DEFINITION = ATTRIBUTE_VALUE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>The Original Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>The Original Value</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE = ATTRIBUTE_VALUE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>The Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>The Value</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_XHTML__THE_VALUE = ATTRIBUTE_VALUE_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Value XHTML</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Attribute Value XHTML</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_XHTML_FEATURE_COUNT = ATTRIBUTE_VALUE_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.SpecElementWithAttributesImpl <em>Spec Element With Attributes</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.SpecElementWithAttributesImpl
+	 * <em>Spec Element With Attributes</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.SpecElementWithAttributesImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecElementWithAttributes()
 	 * @generated
@@ -295,72 +278,68 @@
 	int SPEC_ELEMENT_WITH_ATTRIBUTES = 4;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_ELEMENT_WITH_ATTRIBUTES__DESC = IDENTIFIABLE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_ELEMENT_WITH_ATTRIBUTES__IDENTIFIER = IDENTIFIABLE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_ELEMENT_WITH_ATTRIBUTES__LAST_CHANGE = IDENTIFIABLE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_ELEMENT_WITH_ATTRIBUTES__LONG_NAME = IDENTIFIABLE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_ELEMENT_WITH_ATTRIBUTES__ALTERNATIVE_ID = IDENTIFIABLE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Values</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Values</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES = IDENTIFIABLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Spec Element With Attributes</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Spec Element With Attributes</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_ELEMENT_WITH_ATTRIBUTES_FEATURE_COUNT = IDENTIFIABLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionImpl <em>Attribute Definition</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionImpl
+	 * <em>Attribute Definition</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinition()
 	 * @generated
@@ -368,72 +347,67 @@
 	int ATTRIBUTE_DEFINITION = 6;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION__DESC = ACCESS_CONTROLLED_ELEMENT__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION__IDENTIFIER = ACCESS_CONTROLLED_ELEMENT__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION__LAST_CHANGE = ACCESS_CONTROLLED_ELEMENT__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION__LONG_NAME = ACCESS_CONTROLLED_ELEMENT__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION__ALTERNATIVE_ID = ACCESS_CONTROLLED_ELEMENT__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Editable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Editable</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION__EDITABLE = ACCESS_CONTROLLED_ELEMENT__EDITABLE;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Definition</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Attribute Definition</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_FEATURE_COUNT = ACCESS_CONTROLLED_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionXHTMLImpl <em>Attribute Definition XHTML</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionXHTMLImpl
+	 * <em>Attribute Definition XHTML</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionXHTMLImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinitionXHTML()
 	 * @generated
@@ -441,90 +415,84 @@
 	int ATTRIBUTE_DEFINITION_XHTML = 5;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_XHTML__DESC = ATTRIBUTE_DEFINITION__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_XHTML__IDENTIFIER = ATTRIBUTE_DEFINITION__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_XHTML__LAST_CHANGE = ATTRIBUTE_DEFINITION__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_XHTML__LONG_NAME = ATTRIBUTE_DEFINITION__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_XHTML__ALTERNATIVE_ID = ATTRIBUTE_DEFINITION__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Editable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Editable</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_XHTML__EDITABLE = ATTRIBUTE_DEFINITION__EDITABLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_XHTML__TYPE = ATTRIBUTE_DEFINITION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Default Value</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE = ATTRIBUTE_DEFINITION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Definition XHTML</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Attribute Definition XHTML</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_XHTML_FEATURE_COUNT = ATTRIBUTE_DEFINITION_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.SpecTypeImpl <em>Spec Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.SpecTypeImpl <em>Spec Type</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.SpecTypeImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecType()
 	 * @generated
@@ -532,63 +500,59 @@
 	int SPEC_TYPE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_TYPE__DESC = IDENTIFIABLE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_TYPE__IDENTIFIER = IDENTIFIABLE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_TYPE__LAST_CHANGE = IDENTIFIABLE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_TYPE__LONG_NAME = IDENTIFIABLE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_TYPE__ALTERNATIVE_ID = IDENTIFIABLE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Spec Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Spec Attributes</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_TYPE__SPEC_ATTRIBUTES = IDENTIFIABLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Spec Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Spec Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -596,8 +560,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.ReqIFContentImpl <em>Req IF Content</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIFContentImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getReqIFContent()
 	 * @generated
@@ -605,72 +569,72 @@
 	int REQ_IF_CONTENT = 8;
 
 	/**
-	 * The feature id for the '<em><b>Datatypes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Datatypes</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_CONTENT__DATATYPES = 0;
 
 	/**
-	 * The feature id for the '<em><b>Spec Types</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Spec Types</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_CONTENT__SPEC_TYPES = 1;
 
 	/**
-	 * The feature id for the '<em><b>Spec Objects</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Spec Objects</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_CONTENT__SPEC_OBJECTS = 2;
 
 	/**
-	 * The feature id for the '<em><b>Spec Relations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Spec Relations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_CONTENT__SPEC_RELATIONS = 3;
 
 	/**
-	 * The feature id for the '<em><b>Specifications</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Specifications</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_CONTENT__SPECIFICATIONS = 4;
 
 	/**
-	 * The feature id for the '<em><b>Spec Relation Groups</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Spec Relation Groups</b></em>' containment reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_CONTENT__SPEC_RELATION_GROUPS = 5;
 
 	/**
-	 * The number of structural features of the '<em>Req IF Content</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Req IF Content</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_CONTENT_FEATURE_COUNT = 6;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.ReqIFImpl <em>Req IF</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.ReqIFImpl <em>Req IF</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIFImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getReqIF()
 	 * @generated
@@ -678,45 +642,43 @@
 	int REQ_IF = 9;
 
 	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Lang</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF__LANG = 0;
 
 	/**
-	 * The feature id for the '<em><b>The Header</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>The Header</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF__THE_HEADER = 1;
 
 	/**
-	 * The feature id for the '<em><b>Core Content</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Core Content</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF__CORE_CONTENT = 2;
 
 	/**
-	 * The feature id for the '<em><b>Tool Extensions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Tool Extensions</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF__TOOL_EXTENSIONS = 3;
 
 	/**
-	 * The number of structural features of the '<em>Req IF</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Req IF</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -724,8 +686,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl <em>Req IF Header</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getReqIFHeader()
 	 * @generated
@@ -733,90 +695,82 @@
 	int REQ_IF_HEADER = 10;
 
 	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Comment</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_HEADER__COMMENT = 0;
 
 	/**
-	 * The feature id for the '<em><b>Creation Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Creation Time</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_HEADER__CREATION_TIME = 1;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_HEADER__IDENTIFIER = 2;
 
 	/**
-	 * The feature id for the '<em><b>Repository Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Repository Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_HEADER__REPOSITORY_ID = 3;
 
 	/**
-	 * The feature id for the '<em><b>Req IF Tool Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Req IF Tool Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_HEADER__REQ_IF_TOOL_ID = 4;
 
 	/**
-	 * The feature id for the '<em><b>Req IF Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Req IF Version</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_HEADER__REQ_IF_VERSION = 5;
 
 	/**
-	 * The feature id for the '<em><b>Source Tool Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source Tool Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_HEADER__SOURCE_TOOL_ID = 6;
 
 	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_HEADER__TITLE = 7;
 
 	/**
-	 * The number of structural features of the '<em>Req IF Header</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Req IF Header</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_HEADER_FEATURE_COUNT = 8;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.ReqIFToolExtensionImpl <em>Req IF Tool Extension</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.ReqIFToolExtensionImpl
+	 * <em>Req IF Tool Extension</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIFToolExtensionImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getReqIFToolExtension()
 	 * @generated
@@ -824,27 +778,27 @@
 	int REQ_IF_TOOL_EXTENSION = 11;
 
 	/**
-	 * The feature id for the '<em><b>Extensions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Extensions</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_TOOL_EXTENSION__EXTENSIONS = 0;
 
 	/**
-	 * The number of structural features of the '<em>Req IF Tool Extension</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Req IF Tool Extension</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REQ_IF_TOOL_EXTENSION_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.SpecObjectImpl <em>Spec Object</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.SpecObjectImpl <em>Spec Object</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.SpecObjectImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecObject()
 	 * @generated
@@ -852,81 +806,76 @@
 	int SPEC_OBJECT = 12;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_OBJECT__DESC = SPEC_ELEMENT_WITH_ATTRIBUTES__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_OBJECT__IDENTIFIER = SPEC_ELEMENT_WITH_ATTRIBUTES__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_OBJECT__LAST_CHANGE = SPEC_ELEMENT_WITH_ATTRIBUTES__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_OBJECT__LONG_NAME = SPEC_ELEMENT_WITH_ATTRIBUTES__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_OBJECT__ALTERNATIVE_ID = SPEC_ELEMENT_WITH_ATTRIBUTES__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Values</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Values</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_OBJECT__VALUES = SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_OBJECT__TYPE = SPEC_ELEMENT_WITH_ATTRIBUTES_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Spec Object</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Spec Object</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_OBJECT_FEATURE_COUNT = SPEC_ELEMENT_WITH_ATTRIBUTES_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.SpecObjectTypeImpl <em>Spec Object Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.SpecObjectTypeImpl <em>Spec Object Type</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.SpecObjectTypeImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecObjectType()
 	 * @generated
@@ -934,63 +883,59 @@
 	int SPEC_OBJECT_TYPE = 13;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_OBJECT_TYPE__DESC = SPEC_TYPE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_OBJECT_TYPE__IDENTIFIER = SPEC_TYPE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_OBJECT_TYPE__LAST_CHANGE = SPEC_TYPE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_OBJECT_TYPE__LONG_NAME = SPEC_TYPE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_OBJECT_TYPE__ALTERNATIVE_ID = SPEC_TYPE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Spec Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Spec Attributes</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_OBJECT_TYPE__SPEC_ATTRIBUTES = SPEC_TYPE__SPEC_ATTRIBUTES;
 
 	/**
-	 * The number of structural features of the '<em>Spec Object Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Spec Object Type</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -998,8 +943,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.SpecificationImpl <em>Specification</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.SpecificationImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecification()
 	 * @generated
@@ -1007,90 +952,85 @@
 	int SPECIFICATION = 14;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPECIFICATION__DESC = SPEC_ELEMENT_WITH_ATTRIBUTES__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPECIFICATION__IDENTIFIER = SPEC_ELEMENT_WITH_ATTRIBUTES__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPECIFICATION__LAST_CHANGE = SPEC_ELEMENT_WITH_ATTRIBUTES__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPECIFICATION__LONG_NAME = SPEC_ELEMENT_WITH_ATTRIBUTES__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPECIFICATION__ALTERNATIVE_ID = SPEC_ELEMENT_WITH_ATTRIBUTES__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Values</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Values</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPECIFICATION__VALUES = SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPECIFICATION__TYPE = SPEC_ELEMENT_WITH_ATTRIBUTES_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPECIFICATION__CHILDREN = SPEC_ELEMENT_WITH_ATTRIBUTES_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Specification</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Specification</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPECIFICATION_FEATURE_COUNT = SPEC_ELEMENT_WITH_ATTRIBUTES_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.SpecificationTypeImpl <em>Specification Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.SpecificationTypeImpl
+	 * <em>Specification Type</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.SpecificationTypeImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecificationType()
 	 * @generated
@@ -1098,72 +1038,68 @@
 	int SPECIFICATION_TYPE = 15;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPECIFICATION_TYPE__DESC = SPEC_TYPE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPECIFICATION_TYPE__IDENTIFIER = SPEC_TYPE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPECIFICATION_TYPE__LAST_CHANGE = SPEC_TYPE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPECIFICATION_TYPE__LONG_NAME = SPEC_TYPE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPECIFICATION_TYPE__ALTERNATIVE_ID = SPEC_TYPE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Spec Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Spec Attributes</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPECIFICATION_TYPE__SPEC_ATTRIBUTES = SPEC_TYPE__SPEC_ATTRIBUTES;
 
 	/**
-	 * The number of structural features of the '<em>Specification Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Specification Type</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPECIFICATION_TYPE_FEATURE_COUNT = SPEC_TYPE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.SpecHierarchyImpl <em>Spec Hierarchy</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.SpecHierarchyImpl <em>Spec Hierarchy</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.SpecHierarchyImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecHierarchy()
 	 * @generated
@@ -1171,108 +1107,101 @@
 	int SPEC_HIERARCHY = 16;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_HIERARCHY__DESC = ACCESS_CONTROLLED_ELEMENT__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_HIERARCHY__IDENTIFIER = ACCESS_CONTROLLED_ELEMENT__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_HIERARCHY__LAST_CHANGE = ACCESS_CONTROLLED_ELEMENT__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_HIERARCHY__LONG_NAME = ACCESS_CONTROLLED_ELEMENT__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_HIERARCHY__ALTERNATIVE_ID = ACCESS_CONTROLLED_ELEMENT__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Editable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Editable</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_HIERARCHY__EDITABLE = ACCESS_CONTROLLED_ELEMENT__EDITABLE;
 
 	/**
-	 * The feature id for the '<em><b>Table Internal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Table Internal</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_HIERARCHY__TABLE_INTERNAL = ACCESS_CONTROLLED_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Object</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Object</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_HIERARCHY__OBJECT = ACCESS_CONTROLLED_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_HIERARCHY__CHILDREN = ACCESS_CONTROLLED_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Editable Atts</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Editable Atts</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_HIERARCHY__EDITABLE_ATTS = ACCESS_CONTROLLED_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the '<em>Spec Hierarchy</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Spec Hierarchy</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_HIERARCHY_FEATURE_COUNT = ACCESS_CONTROLLED_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionImpl <em>Datatype Definition</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionImpl
+	 * <em>Datatype Definition</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinition()
 	 * @generated
@@ -1280,54 +1209,50 @@
 	int DATATYPE_DEFINITION = 17;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION__DESC = IDENTIFIABLE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION__IDENTIFIER = IDENTIFIABLE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION__LAST_CHANGE = IDENTIFIABLE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION__LONG_NAME = IDENTIFIABLE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION__ALTERNATIVE_ID = IDENTIFIABLE__ALTERNATIVE_ID;
 
 	/**
-	 * The number of structural features of the '<em>Datatype Definition</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Datatype Definition</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1335,8 +1260,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.SpecRelationImpl <em>Spec Relation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.SpecRelationImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecRelation()
 	 * @generated
@@ -1344,99 +1269,92 @@
 	int SPEC_RELATION = 18;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION__DESC = SPEC_ELEMENT_WITH_ATTRIBUTES__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION__IDENTIFIER = SPEC_ELEMENT_WITH_ATTRIBUTES__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION__LAST_CHANGE = SPEC_ELEMENT_WITH_ATTRIBUTES__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION__LONG_NAME = SPEC_ELEMENT_WITH_ATTRIBUTES__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION__ALTERNATIVE_ID = SPEC_ELEMENT_WITH_ATTRIBUTES__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Values</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Values</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION__VALUES = SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES;
 
 	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION__TARGET = SPEC_ELEMENT_WITH_ATTRIBUTES_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION__SOURCE = SPEC_ELEMENT_WITH_ATTRIBUTES_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION__TYPE = SPEC_ELEMENT_WITH_ATTRIBUTES_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>Spec Relation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Spec Relation</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION_FEATURE_COUNT = SPEC_ELEMENT_WITH_ATTRIBUTES_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.SpecRelationTypeImpl <em>Spec Relation Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.SpecRelationTypeImpl <em>Spec Relation Type</em>}
+	 * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.SpecRelationTypeImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecRelationType()
 	 * @generated
@@ -1444,72 +1362,68 @@
 	int SPEC_RELATION_TYPE = 19;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION_TYPE__DESC = SPEC_TYPE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION_TYPE__IDENTIFIER = SPEC_TYPE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION_TYPE__LAST_CHANGE = SPEC_TYPE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION_TYPE__LONG_NAME = SPEC_TYPE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION_TYPE__ALTERNATIVE_ID = SPEC_TYPE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Spec Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Spec Attributes</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION_TYPE__SPEC_ATTRIBUTES = SPEC_TYPE__SPEC_ATTRIBUTES;
 
 	/**
-	 * The number of structural features of the '<em>Spec Relation Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Spec Relation Type</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPEC_RELATION_TYPE_FEATURE_COUNT = SPEC_TYPE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.RelationGroupImpl <em>Relation Group</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.RelationGroupImpl <em>Relation Group</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.RelationGroupImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getRelationGroup()
 	 * @generated
@@ -1517,99 +1431,94 @@
 	int RELATION_GROUP = 20;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP__DESC = IDENTIFIABLE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP__IDENTIFIER = IDENTIFIABLE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP__LAST_CHANGE = IDENTIFIABLE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP__LONG_NAME = IDENTIFIABLE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP__ALTERNATIVE_ID = IDENTIFIABLE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Spec Relations</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Spec Relations</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP__SPEC_RELATIONS = IDENTIFIABLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP__TYPE = IDENTIFIABLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Source Specification</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source Specification</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP__SOURCE_SPECIFICATION = IDENTIFIABLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Target Specification</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Specification</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP__TARGET_SPECIFICATION = IDENTIFIABLE_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the '<em>Relation Group</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Relation Group</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP_FEATURE_COUNT = IDENTIFIABLE_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.RelationGroupTypeImpl <em>Relation Group Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.RelationGroupTypeImpl
+	 * <em>Relation Group Type</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.RelationGroupTypeImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getRelationGroupType()
 	 * @generated
@@ -1617,72 +1526,68 @@
 	int RELATION_GROUP_TYPE = 21;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP_TYPE__DESC = SPEC_TYPE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP_TYPE__IDENTIFIER = SPEC_TYPE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP_TYPE__LAST_CHANGE = SPEC_TYPE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP_TYPE__LONG_NAME = SPEC_TYPE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP_TYPE__ALTERNATIVE_ID = SPEC_TYPE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Spec Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Spec Attributes</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP_TYPE__SPEC_ATTRIBUTES = SPEC_TYPE__SPEC_ATTRIBUTES;
 
 	/**
-	 * The number of structural features of the '<em>Relation Group Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Relation Group Type</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATION_GROUP_TYPE_FEATURE_COUNT = SPEC_TYPE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionXHTMLImpl <em>Datatype Definition XHTML</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionXHTMLImpl
+	 * <em>Datatype Definition XHTML</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionXHTMLImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinitionXHTML()
 	 * @generated
@@ -1690,63 +1595,59 @@
 	int DATATYPE_DEFINITION_XHTML = 22;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_XHTML__DESC = DATATYPE_DEFINITION__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_XHTML__IDENTIFIER = DATATYPE_DEFINITION__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_XHTML__LAST_CHANGE = DATATYPE_DEFINITION__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_XHTML__LONG_NAME = DATATYPE_DEFINITION__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_XHTML__ALTERNATIVE_ID = DATATYPE_DEFINITION__ALTERNATIVE_ID;
 
 	/**
-	 * The number of structural features of the '<em>Datatype Definition XHTML</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Datatype Definition XHTML</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_XHTML_FEATURE_COUNT = DATATYPE_DEFINITION_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AlternativeIDImpl <em>Alternative ID</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AlternativeIDImpl <em>Alternative ID</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AlternativeIDImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAlternativeID()
 	 * @generated
@@ -1754,27 +1655,26 @@
 	int ALTERNATIVE_ID = 23;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ALTERNATIVE_ID__IDENTIFIER = 0;
 
 	/**
-	 * The number of structural features of the '<em>Alternative ID</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Alternative ID</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ALTERNATIVE_ID_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionSimpleImpl <em>Attribute Definition Simple</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionSimpleImpl
+	 * <em>Attribute Definition Simple</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionSimpleImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinitionSimple()
 	 * @generated
@@ -1782,72 +1682,67 @@
 	int ATTRIBUTE_DEFINITION_SIMPLE = 25;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_SIMPLE__DESC = ATTRIBUTE_DEFINITION__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_SIMPLE__IDENTIFIER = ATTRIBUTE_DEFINITION__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_SIMPLE__LAST_CHANGE = ATTRIBUTE_DEFINITION__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_SIMPLE__LONG_NAME = ATTRIBUTE_DEFINITION__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_SIMPLE__ALTERNATIVE_ID = ATTRIBUTE_DEFINITION__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Editable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Editable</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_SIMPLE__EDITABLE = ATTRIBUTE_DEFINITION__EDITABLE;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Definition Simple</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Attribute Definition Simple</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_SIMPLE_FEATURE_COUNT = ATTRIBUTE_DEFINITION_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionBooleanImpl <em>Attribute Definition Boolean</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionBooleanImpl
+	 * <em>Attribute Definition Boolean</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionBooleanImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinitionBoolean()
 	 * @generated
@@ -1855,90 +1750,84 @@
 	int ATTRIBUTE_DEFINITION_BOOLEAN = 24;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_BOOLEAN__DESC = ATTRIBUTE_DEFINITION_SIMPLE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_BOOLEAN__IDENTIFIER = ATTRIBUTE_DEFINITION_SIMPLE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_BOOLEAN__LAST_CHANGE = ATTRIBUTE_DEFINITION_SIMPLE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_BOOLEAN__LONG_NAME = ATTRIBUTE_DEFINITION_SIMPLE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_BOOLEAN__ALTERNATIVE_ID = ATTRIBUTE_DEFINITION_SIMPLE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Editable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Editable</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_BOOLEAN__EDITABLE = ATTRIBUTE_DEFINITION_SIMPLE__EDITABLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_BOOLEAN__TYPE = ATTRIBUTE_DEFINITION_SIMPLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Default Value</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE = ATTRIBUTE_DEFINITION_SIMPLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Definition Boolean</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Attribute Definition Boolean</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_BOOLEAN_FEATURE_COUNT = ATTRIBUTE_DEFINITION_SIMPLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionSimpleImpl <em>Datatype Definition Simple</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionSimpleImpl
+	 * <em>Datatype Definition Simple</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionSimpleImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinitionSimple()
 	 * @generated
@@ -1946,63 +1835,59 @@
 	int DATATYPE_DEFINITION_SIMPLE = 27;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_SIMPLE__DESC = DATATYPE_DEFINITION__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_SIMPLE__IDENTIFIER = DATATYPE_DEFINITION__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_SIMPLE__LAST_CHANGE = DATATYPE_DEFINITION__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_SIMPLE__LONG_NAME = DATATYPE_DEFINITION__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_SIMPLE__ALTERNATIVE_ID = DATATYPE_DEFINITION__ALTERNATIVE_ID;
 
 	/**
-	 * The number of structural features of the '<em>Datatype Definition Simple</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Datatype Definition Simple</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_SIMPLE_FEATURE_COUNT = DATATYPE_DEFINITION_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionBooleanImpl <em>Datatype Definition Boolean</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionBooleanImpl
+	 * <em>Datatype Definition Boolean</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionBooleanImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinitionBoolean()
 	 * @generated
@@ -2010,63 +1895,59 @@
 	int DATATYPE_DEFINITION_BOOLEAN = 26;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_BOOLEAN__DESC = DATATYPE_DEFINITION_SIMPLE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_BOOLEAN__IDENTIFIER = DATATYPE_DEFINITION_SIMPLE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_BOOLEAN__LAST_CHANGE = DATATYPE_DEFINITION_SIMPLE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_BOOLEAN__LONG_NAME = DATATYPE_DEFINITION_SIMPLE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_BOOLEAN__ALTERNATIVE_ID = DATATYPE_DEFINITION_SIMPLE__ALTERNATIVE_ID;
 
 	/**
-	 * The number of structural features of the '<em>Datatype Definition Boolean</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Datatype Definition Boolean</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_BOOLEAN_FEATURE_COUNT = DATATYPE_DEFINITION_SIMPLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueSimpleImpl <em>Attribute Value Simple</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueSimpleImpl
+	 * <em>Attribute Value Simple</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeValueSimpleImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValueSimple()
 	 * @generated
@@ -2074,18 +1955,18 @@
 	int ATTRIBUTE_VALUE_SIMPLE = 29;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Value Simple</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Attribute Value Simple</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_SIMPLE_FEATURE_COUNT = ATTRIBUTE_VALUE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueBooleanImpl <em>Attribute Value Boolean</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueBooleanImpl
+	 * <em>Attribute Value Boolean</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeValueBooleanImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValueBoolean()
 	 * @generated
@@ -2093,36 +1974,34 @@
 	int ATTRIBUTE_VALUE_BOOLEAN = 28;
 
 	/**
-	 * The feature id for the '<em><b>The Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>The Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE = ATTRIBUTE_VALUE_SIMPLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Definition</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_BOOLEAN__DEFINITION = ATTRIBUTE_VALUE_SIMPLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Value Boolean</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Attribute Value Boolean</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_BOOLEAN_FEATURE_COUNT = ATTRIBUTE_VALUE_SIMPLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionDateImpl <em>Attribute Definition Date</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionDateImpl
+	 * <em>Attribute Definition Date</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionDateImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinitionDate()
 	 * @generated
@@ -2130,90 +2009,84 @@
 	int ATTRIBUTE_DEFINITION_DATE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_DATE__DESC = ATTRIBUTE_DEFINITION_SIMPLE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_DATE__IDENTIFIER = ATTRIBUTE_DEFINITION_SIMPLE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_DATE__LAST_CHANGE = ATTRIBUTE_DEFINITION_SIMPLE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_DATE__LONG_NAME = ATTRIBUTE_DEFINITION_SIMPLE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_DATE__ALTERNATIVE_ID = ATTRIBUTE_DEFINITION_SIMPLE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Editable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Editable</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_DATE__EDITABLE = ATTRIBUTE_DEFINITION_SIMPLE__EDITABLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_DATE__TYPE = ATTRIBUTE_DEFINITION_SIMPLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Default Value</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE = ATTRIBUTE_DEFINITION_SIMPLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Definition Date</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Attribute Definition Date</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_DATE_FEATURE_COUNT = ATTRIBUTE_DEFINITION_SIMPLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionDateImpl <em>Datatype Definition Date</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionDateImpl
+	 * <em>Datatype Definition Date</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionDateImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinitionDate()
 	 * @generated
@@ -2221,63 +2094,59 @@
 	int DATATYPE_DEFINITION_DATE = 31;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_DATE__DESC = DATATYPE_DEFINITION_SIMPLE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_DATE__IDENTIFIER = DATATYPE_DEFINITION_SIMPLE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_DATE__LAST_CHANGE = DATATYPE_DEFINITION_SIMPLE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_DATE__LONG_NAME = DATATYPE_DEFINITION_SIMPLE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_DATE__ALTERNATIVE_ID = DATATYPE_DEFINITION_SIMPLE__ALTERNATIVE_ID;
 
 	/**
-	 * The number of structural features of the '<em>Datatype Definition Date</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Datatype Definition Date</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_DATE_FEATURE_COUNT = DATATYPE_DEFINITION_SIMPLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueDateImpl <em>Attribute Value Date</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueDateImpl
+	 * <em>Attribute Value Date</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeValueDateImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValueDate()
 	 * @generated
@@ -2285,36 +2154,34 @@
 	int ATTRIBUTE_VALUE_DATE = 32;
 
 	/**
-	 * The feature id for the '<em><b>The Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>The Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_DATE__THE_VALUE = ATTRIBUTE_VALUE_SIMPLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Definition</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_DATE__DEFINITION = ATTRIBUTE_VALUE_SIMPLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Value Date</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Attribute Value Date</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_DATE_FEATURE_COUNT = ATTRIBUTE_VALUE_SIMPLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionEnumerationImpl <em>Attribute Definition Enumeration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionEnumerationImpl
+	 * <em>Attribute Definition Enumeration</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionEnumerationImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinitionEnumeration()
 	 * @generated
@@ -2322,99 +2189,92 @@
 	int ATTRIBUTE_DEFINITION_ENUMERATION = 33;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_ENUMERATION__DESC = ATTRIBUTE_DEFINITION__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_ENUMERATION__IDENTIFIER = ATTRIBUTE_DEFINITION__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_ENUMERATION__LAST_CHANGE = ATTRIBUTE_DEFINITION__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_ENUMERATION__LONG_NAME = ATTRIBUTE_DEFINITION__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_ENUMERATION__ALTERNATIVE_ID = ATTRIBUTE_DEFINITION__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Editable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Editable</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_ENUMERATION__EDITABLE = ATTRIBUTE_DEFINITION__EDITABLE;
 
 	/**
-	 * The feature id for the '<em><b>Multi Valued</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Multi Valued</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED = ATTRIBUTE_DEFINITION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_ENUMERATION__TYPE = ATTRIBUTE_DEFINITION_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Default Value</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE = ATTRIBUTE_DEFINITION_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Definition Enumeration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Attribute Definition Enumeration</em>' class. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_ENUMERATION_FEATURE_COUNT = ATTRIBUTE_DEFINITION_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionEnumerationImpl <em>Datatype Definition Enumeration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionEnumerationImpl
+	 * <em>Datatype Definition Enumeration</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionEnumerationImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinitionEnumeration()
 	 * @generated
@@ -2422,72 +2282,68 @@
 	int DATATYPE_DEFINITION_ENUMERATION = 34;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_ENUMERATION__DESC = DATATYPE_DEFINITION__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_ENUMERATION__IDENTIFIER = DATATYPE_DEFINITION__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_ENUMERATION__LAST_CHANGE = DATATYPE_DEFINITION__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_ENUMERATION__LONG_NAME = DATATYPE_DEFINITION__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_ENUMERATION__ALTERNATIVE_ID = DATATYPE_DEFINITION__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Specified Values</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Specified Values</b></em>' containment reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES = DATATYPE_DEFINITION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Datatype Definition Enumeration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Datatype Definition Enumeration</em>' class. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_ENUMERATION_FEATURE_COUNT = DATATYPE_DEFINITION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.EnumValueImpl <em>Enum Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.EnumValueImpl <em>Enum Value</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.EnumValueImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getEnumValue()
 	 * @generated
@@ -2495,72 +2351,68 @@
 	int ENUM_VALUE = 35;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ENUM_VALUE__DESC = IDENTIFIABLE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ENUM_VALUE__IDENTIFIER = IDENTIFIABLE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ENUM_VALUE__LAST_CHANGE = IDENTIFIABLE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ENUM_VALUE__LONG_NAME = IDENTIFIABLE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ENUM_VALUE__ALTERNATIVE_ID = IDENTIFIABLE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Properties</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ENUM_VALUE__PROPERTIES = IDENTIFIABLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Enum Value</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Enum Value</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ENUM_VALUE_FEATURE_COUNT = IDENTIFIABLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.EmbeddedValueImpl <em>Embedded Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.EmbeddedValueImpl <em>Embedded Value</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.EmbeddedValueImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getEmbeddedValue()
 	 * @generated
@@ -2568,36 +2420,34 @@
 	int EMBEDDED_VALUE = 36;
 
 	/**
-	 * The feature id for the '<em><b>Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EMBEDDED_VALUE__KEY = 0;
 
 	/**
-	 * The feature id for the '<em><b>Other Content</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Other Content</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EMBEDDED_VALUE__OTHER_CONTENT = 1;
 
 	/**
-	 * The number of structural features of the '<em>Embedded Value</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Embedded Value</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EMBEDDED_VALUE_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueEnumerationImpl <em>Attribute Value Enumeration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueEnumerationImpl
+	 * <em>Attribute Value Enumeration</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeValueEnumerationImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValueEnumeration()
 	 * @generated
@@ -2605,36 +2455,34 @@
 	int ATTRIBUTE_VALUE_ENUMERATION = 37;
 
 	/**
-	 * The feature id for the '<em><b>Values</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Values</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_ENUMERATION__VALUES = ATTRIBUTE_VALUE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Definition</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_ENUMERATION__DEFINITION = ATTRIBUTE_VALUE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Value Enumeration</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Attribute Value Enumeration</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_ENUMERATION_FEATURE_COUNT = ATTRIBUTE_VALUE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionIntegerImpl <em>Attribute Definition Integer</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionIntegerImpl
+	 * <em>Attribute Definition Integer</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionIntegerImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinitionInteger()
 	 * @generated
@@ -2642,90 +2490,84 @@
 	int ATTRIBUTE_DEFINITION_INTEGER = 38;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_INTEGER__DESC = ATTRIBUTE_DEFINITION_SIMPLE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_INTEGER__IDENTIFIER = ATTRIBUTE_DEFINITION_SIMPLE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_INTEGER__LAST_CHANGE = ATTRIBUTE_DEFINITION_SIMPLE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_INTEGER__LONG_NAME = ATTRIBUTE_DEFINITION_SIMPLE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_INTEGER__ALTERNATIVE_ID = ATTRIBUTE_DEFINITION_SIMPLE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Editable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Editable</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_INTEGER__EDITABLE = ATTRIBUTE_DEFINITION_SIMPLE__EDITABLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_INTEGER__TYPE = ATTRIBUTE_DEFINITION_SIMPLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Default Value</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE = ATTRIBUTE_DEFINITION_SIMPLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Definition Integer</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Attribute Definition Integer</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_INTEGER_FEATURE_COUNT = ATTRIBUTE_DEFINITION_SIMPLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionIntegerImpl <em>Datatype Definition Integer</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionIntegerImpl
+	 * <em>Datatype Definition Integer</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionIntegerImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinitionInteger()
 	 * @generated
@@ -2733,81 +2575,75 @@
 	int DATATYPE_DEFINITION_INTEGER = 39;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_INTEGER__DESC = DATATYPE_DEFINITION_SIMPLE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_INTEGER__IDENTIFIER = DATATYPE_DEFINITION_SIMPLE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_INTEGER__LAST_CHANGE = DATATYPE_DEFINITION_SIMPLE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_INTEGER__LONG_NAME = DATATYPE_DEFINITION_SIMPLE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_INTEGER__ALTERNATIVE_ID = DATATYPE_DEFINITION_SIMPLE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Max</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Max</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_INTEGER__MAX = DATATYPE_DEFINITION_SIMPLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Min</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Min</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_INTEGER__MIN = DATATYPE_DEFINITION_SIMPLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Datatype Definition Integer</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Datatype Definition Integer</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_INTEGER_FEATURE_COUNT = DATATYPE_DEFINITION_SIMPLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueIntegerImpl <em>Attribute Value Integer</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueIntegerImpl
+	 * <em>Attribute Value Integer</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeValueIntegerImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValueInteger()
 	 * @generated
@@ -2815,36 +2651,34 @@
 	int ATTRIBUTE_VALUE_INTEGER = 40;
 
 	/**
-	 * The feature id for the '<em><b>The Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>The Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_INTEGER__THE_VALUE = ATTRIBUTE_VALUE_SIMPLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Definition</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_INTEGER__DEFINITION = ATTRIBUTE_VALUE_SIMPLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Value Integer</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Attribute Value Integer</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_INTEGER_FEATURE_COUNT = ATTRIBUTE_VALUE_SIMPLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionRealImpl <em>Attribute Definition Real</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionRealImpl
+	 * <em>Attribute Definition Real</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionRealImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinitionReal()
 	 * @generated
@@ -2852,90 +2686,84 @@
 	int ATTRIBUTE_DEFINITION_REAL = 41;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_REAL__DESC = ATTRIBUTE_DEFINITION_SIMPLE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_REAL__IDENTIFIER = ATTRIBUTE_DEFINITION_SIMPLE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_REAL__LAST_CHANGE = ATTRIBUTE_DEFINITION_SIMPLE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_REAL__LONG_NAME = ATTRIBUTE_DEFINITION_SIMPLE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_REAL__ALTERNATIVE_ID = ATTRIBUTE_DEFINITION_SIMPLE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Editable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Editable</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_REAL__EDITABLE = ATTRIBUTE_DEFINITION_SIMPLE__EDITABLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_REAL__TYPE = ATTRIBUTE_DEFINITION_SIMPLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Default Value</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE = ATTRIBUTE_DEFINITION_SIMPLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Definition Real</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Attribute Definition Real</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_REAL_FEATURE_COUNT = ATTRIBUTE_DEFINITION_SIMPLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionRealImpl <em>Datatype Definition Real</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionRealImpl
+	 * <em>Datatype Definition Real</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionRealImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinitionReal()
 	 * @generated
@@ -2943,90 +2771,83 @@
 	int DATATYPE_DEFINITION_REAL = 42;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_REAL__DESC = DATATYPE_DEFINITION_SIMPLE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_REAL__IDENTIFIER = DATATYPE_DEFINITION_SIMPLE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_REAL__LAST_CHANGE = DATATYPE_DEFINITION_SIMPLE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_REAL__LONG_NAME = DATATYPE_DEFINITION_SIMPLE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_REAL__ALTERNATIVE_ID = DATATYPE_DEFINITION_SIMPLE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Accuracy</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Accuracy</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_REAL__ACCURACY = DATATYPE_DEFINITION_SIMPLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Max</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Max</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_REAL__MAX = DATATYPE_DEFINITION_SIMPLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Min</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Min</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_REAL__MIN = DATATYPE_DEFINITION_SIMPLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>Datatype Definition Real</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Datatype Definition Real</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_REAL_FEATURE_COUNT = DATATYPE_DEFINITION_SIMPLE_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueRealImpl <em>Attribute Value Real</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueRealImpl
+	 * <em>Attribute Value Real</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeValueRealImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValueReal()
 	 * @generated
@@ -3034,36 +2855,34 @@
 	int ATTRIBUTE_VALUE_REAL = 43;
 
 	/**
-	 * The feature id for the '<em><b>The Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>The Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_REAL__THE_VALUE = ATTRIBUTE_VALUE_SIMPLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Definition</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_REAL__DEFINITION = ATTRIBUTE_VALUE_SIMPLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Value Real</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Attribute Value Real</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_REAL_FEATURE_COUNT = ATTRIBUTE_VALUE_SIMPLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionStringImpl <em>Attribute Definition String</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionStringImpl
+	 * <em>Attribute Definition String</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionStringImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinitionString()
 	 * @generated
@@ -3071,90 +2890,84 @@
 	int ATTRIBUTE_DEFINITION_STRING = 44;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_STRING__DESC = ATTRIBUTE_DEFINITION_SIMPLE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_STRING__IDENTIFIER = ATTRIBUTE_DEFINITION_SIMPLE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_STRING__LAST_CHANGE = ATTRIBUTE_DEFINITION_SIMPLE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_STRING__LONG_NAME = ATTRIBUTE_DEFINITION_SIMPLE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_STRING__ALTERNATIVE_ID = ATTRIBUTE_DEFINITION_SIMPLE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Editable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Editable</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_STRING__EDITABLE = ATTRIBUTE_DEFINITION_SIMPLE__EDITABLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_STRING__TYPE = ATTRIBUTE_DEFINITION_SIMPLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Default Value</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE = ATTRIBUTE_DEFINITION_SIMPLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Definition String</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Attribute Definition String</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_DEFINITION_STRING_FEATURE_COUNT = ATTRIBUTE_DEFINITION_SIMPLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionStringImpl <em>Datatype Definition String</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionStringImpl
+	 * <em>Datatype Definition String</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionStringImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinitionString()
 	 * @generated
@@ -3162,72 +2975,67 @@
 	int DATATYPE_DEFINITION_STRING = 45;
 
 	/**
-	 * The feature id for the '<em><b>Desc</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Desc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_STRING__DESC = DATATYPE_DEFINITION_SIMPLE__DESC;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_STRING__IDENTIFIER = DATATYPE_DEFINITION_SIMPLE__IDENTIFIER;
 
 	/**
-	 * The feature id for the '<em><b>Last Change</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Last Change</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_STRING__LAST_CHANGE = DATATYPE_DEFINITION_SIMPLE__LAST_CHANGE;
 
 	/**
-	 * The feature id for the '<em><b>Long Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Long Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_STRING__LONG_NAME = DATATYPE_DEFINITION_SIMPLE__LONG_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Alternative ID</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_STRING__ALTERNATIVE_ID = DATATYPE_DEFINITION_SIMPLE__ALTERNATIVE_ID;
 
 	/**
-	 * The feature id for the '<em><b>Max Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Max Length</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_STRING__MAX_LENGTH = DATATYPE_DEFINITION_SIMPLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Datatype Definition String</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Datatype Definition String</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATATYPE_DEFINITION_STRING_FEATURE_COUNT = DATATYPE_DEFINITION_SIMPLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueStringImpl <em>Attribute Value String</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueStringImpl
+	 * <em>Attribute Value String</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.AttributeValueStringImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValueString()
 	 * @generated
@@ -3235,27 +3043,25 @@
 	int ATTRIBUTE_VALUE_STRING = 46;
 
 	/**
-	 * The feature id for the '<em><b>The Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>The Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_STRING__THE_VALUE = ATTRIBUTE_VALUE_SIMPLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Definition</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ATTRIBUTE_VALUE_STRING__DEFINITION = ATTRIBUTE_VALUE_SIMPLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Attribute Value String</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Attribute Value String</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3263,8 +3069,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.impl.XhtmlContentImpl <em>Xhtml Content</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.rmf.reqif10.impl.XhtmlContentImpl
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getXhtmlContent()
 	 * @generated
@@ -3272,36 +3078,34 @@
 	int XHTML_CONTENT = 47;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CONTENT__XHTML = 0;
 
 	/**
-	 * The feature id for the '<em><b>Xhtml Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Xhtml Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CONTENT__XHTML_SOURCE = 1;
 
 	/**
-	 * The number of structural features of the '<em>Xhtml Content</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Xhtml Content</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int XHTML_CONTENT_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '<em>Date Time</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Date Time</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.util.GregorianCalendar
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDateTime()
 	 * @generated
@@ -3309,20 +3113,18 @@
 	int DATE_TIME = 48;
 
 	/**
-	 * The meta object id for the '<em>ID</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>ID</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getID()
 	 * @generated
 	 */
 	int ID = 49;
 
-
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AccessControlledElement <em>Access Controlled Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AccessControlledElement
+	 * <em>Access Controlled Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Access Controlled Element</em>'.
 	 * @see org.eclipse.rmf.reqif10.AccessControlledElement
 	 * @generated
@@ -3330,9 +3132,9 @@
 	EClass getAccessControlledElement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AccessControlledElement#isEditable <em>Editable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AccessControlledElement#isEditable
+	 * <em>Editable</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Editable</em>'.
 	 * @see org.eclipse.rmf.reqif10.AccessControlledElement#isEditable()
 	 * @see #getAccessControlledElement()
@@ -3341,9 +3143,9 @@
 	EAttribute getAccessControlledElement_Editable();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.Identifiable <em>Identifiable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.Identifiable <em>Identifiable</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Identifiable</em>'.
 	 * @see org.eclipse.rmf.reqif10.Identifiable
 	 * @generated
@@ -3352,8 +3154,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.Identifiable#getDesc <em>Desc</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Desc</em>'.
 	 * @see org.eclipse.rmf.reqif10.Identifiable#getDesc()
 	 * @see #getIdentifiable()
@@ -3362,9 +3164,9 @@
 	EAttribute getIdentifiable_Desc();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.Identifiable#getIdentifier <em>Identifier</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.Identifiable#getIdentifier
+	 * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Identifier</em>'.
 	 * @see org.eclipse.rmf.reqif10.Identifiable#getIdentifier()
 	 * @see #getIdentifiable()
@@ -3373,9 +3175,9 @@
 	EAttribute getIdentifiable_Identifier();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.Identifiable#getLastChange <em>Last Change</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.Identifiable#getLastChange
+	 * <em>Last Change</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Last Change</em>'.
 	 * @see org.eclipse.rmf.reqif10.Identifiable#getLastChange()
 	 * @see #getIdentifiable()
@@ -3384,9 +3186,9 @@
 	EAttribute getIdentifiable_LastChange();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.Identifiable#getLongName <em>Long Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.Identifiable#getLongName
+	 * <em>Long Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Long Name</em>'.
 	 * @see org.eclipse.rmf.reqif10.Identifiable#getLongName()
 	 * @see #getIdentifiable()
@@ -3395,9 +3197,10 @@
 	EAttribute getIdentifiable_LongName();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.Identifiable#getAlternativeID <em>Alternative ID</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.rmf.reqif10.Identifiable#getAlternativeID <em>Alternative ID</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Alternative ID</em>'.
 	 * @see org.eclipse.rmf.reqif10.Identifiable#getAlternativeID()
 	 * @see #getIdentifiable()
@@ -3406,9 +3209,9 @@
 	EReference getIdentifiable_AlternativeID();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML <em>Attribute Value XHTML</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML
+	 * <em>Attribute Value XHTML</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Value XHTML</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueXHTML
 	 * @generated
@@ -3416,9 +3219,9 @@
 	EClass getAttributeValueXHTML();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#isSimplified <em>Simplified</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#isSimplified
+	 * <em>Simplified</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Simplified</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueXHTML#isSimplified()
 	 * @see #getAttributeValueXHTML()
@@ -3427,9 +3230,9 @@
 	EAttribute getAttributeValueXHTML_Simplified();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getDefinition <em>Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getDefinition
+	 * <em>Definition</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Definition</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueXHTML#getDefinition()
 	 * @see #getAttributeValueXHTML()
@@ -3438,9 +3241,10 @@
 	EReference getAttributeValueXHTML_Definition();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheOriginalValue <em>The Original Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheOriginalValue <em>The Original Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>The Original Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheOriginalValue()
 	 * @see #getAttributeValueXHTML()
@@ -3449,9 +3253,10 @@
 	EReference getAttributeValueXHTML_TheOriginalValue();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheValue <em>The Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheValue <em>The Value</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>The Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueXHTML#getTheValue()
 	 * @see #getAttributeValueXHTML()
@@ -3460,9 +3265,9 @@
 	EReference getAttributeValueXHTML_TheValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValue <em>Attribute Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValue <em>Attribute Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValue
 	 * @generated
@@ -3470,9 +3275,9 @@
 	EClass getAttributeValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.SpecElementWithAttributes <em>Spec Element With Attributes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.SpecElementWithAttributes
+	 * <em>Spec Element With Attributes</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Spec Element With Attributes</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecElementWithAttributes
 	 * @generated
@@ -3480,9 +3285,10 @@
 	EClass getSpecElementWithAttributes();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.SpecElementWithAttributes#getValues <em>Values</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.SpecElementWithAttributes#getValues <em>Values</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Values</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecElementWithAttributes#getValues()
 	 * @see #getSpecElementWithAttributes()
@@ -3491,9 +3297,9 @@
 	EReference getSpecElementWithAttributes_Values();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML <em>Attribute Definition XHTML</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML
+	 * <em>Attribute Definition XHTML</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Definition XHTML</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionXHTML
 	 * @generated
@@ -3501,9 +3307,9 @@
 	EClass getAttributeDefinitionXHTML();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getType
+	 * <em>Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getType()
 	 * @see #getAttributeDefinitionXHTML()
@@ -3512,9 +3318,10 @@
 	EReference getAttributeDefinitionXHTML_Type();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getDefaultValue <em>Default Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getDefaultValue <em>Default Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Default Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionXHTML#getDefaultValue()
 	 * @see #getAttributeDefinitionXHTML()
@@ -3523,9 +3330,9 @@
 	EReference getAttributeDefinitionXHTML_DefaultValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinition <em>Attribute Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinition
+	 * <em>Attribute Definition</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Definition</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinition
 	 * @generated
@@ -3533,9 +3340,9 @@
 	EClass getAttributeDefinition();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.SpecType <em>Spec Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.SpecType <em>Spec Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Spec Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecType
 	 * @generated
@@ -3543,9 +3350,10 @@
 	EClass getSpecType();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.SpecType#getSpecAttributes <em>Spec Attributes</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.SpecType#getSpecAttributes <em>Spec Attributes</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Spec Attributes</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecType#getSpecAttributes()
 	 * @see #getSpecType()
@@ -3554,9 +3362,9 @@
 	EReference getSpecType_SpecAttributes();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.ReqIFContent <em>Req IF Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.ReqIFContent <em>Req IF Content</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Req IF Content</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFContent
 	 * @generated
@@ -3564,9 +3372,10 @@
 	EClass getReqIFContent();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.ReqIFContent#getDatatypes <em>Datatypes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.ReqIFContent#getDatatypes <em>Datatypes</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Datatypes</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFContent#getDatatypes()
 	 * @see #getReqIFContent()
@@ -3575,9 +3384,10 @@
 	EReference getReqIFContent_Datatypes();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecTypes <em>Spec Types</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecTypes <em>Spec Types</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Spec Types</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFContent#getSpecTypes()
 	 * @see #getReqIFContent()
@@ -3586,9 +3396,10 @@
 	EReference getReqIFContent_SpecTypes();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecObjects <em>Spec Objects</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecObjects <em>Spec Objects</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Spec Objects</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFContent#getSpecObjects()
 	 * @see #getReqIFContent()
@@ -3597,9 +3408,10 @@
 	EReference getReqIFContent_SpecObjects();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelations <em>Spec Relations</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelations <em>Spec Relations</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Spec Relations</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelations()
 	 * @see #getReqIFContent()
@@ -3608,9 +3420,10 @@
 	EReference getReqIFContent_SpecRelations();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecifications <em>Specifications</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecifications <em>Specifications</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Specifications</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFContent#getSpecifications()
 	 * @see #getReqIFContent()
@@ -3619,9 +3432,10 @@
 	EReference getReqIFContent_Specifications();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelationGroups <em>Spec Relation Groups</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelationGroups <em>Spec Relation Groups</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Spec Relation Groups</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelationGroups()
 	 * @see #getReqIFContent()
@@ -3630,9 +3444,9 @@
 	EReference getReqIFContent_SpecRelationGroups();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.ReqIF <em>Req IF</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.ReqIF <em>Req IF</em>}'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Req IF</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIF
 	 * @generated
@@ -3640,9 +3454,9 @@
 	EClass getReqIF();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIF#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIF#getLang <em>Lang</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lang</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIF#getLang()
 	 * @see #getReqIF()
@@ -3651,9 +3465,9 @@
 	EAttribute getReqIF_Lang();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.ReqIF#getTheHeader <em>The Header</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.ReqIF#getTheHeader
+	 * <em>The Header</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>The Header</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIF#getTheHeader()
 	 * @see #getReqIF()
@@ -3662,9 +3476,9 @@
 	EReference getReqIF_TheHeader();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.ReqIF#getCoreContent <em>Core Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.ReqIF#getCoreContent
+	 * <em>Core Content</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Core Content</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIF#getCoreContent()
 	 * @see #getReqIF()
@@ -3673,9 +3487,10 @@
 	EReference getReqIF_CoreContent();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.ReqIF#getToolExtensions <em>Tool Extensions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.ReqIF#getToolExtensions <em>Tool Extensions</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tool Extensions</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIF#getToolExtensions()
 	 * @see #getReqIF()
@@ -3684,9 +3499,9 @@
 	EReference getReqIF_ToolExtensions();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.ReqIFHeader <em>Req IF Header</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.ReqIFHeader <em>Req IF Header</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Req IF Header</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFHeader
 	 * @generated
@@ -3694,9 +3509,9 @@
 	EClass getReqIFHeader();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getComment <em>Comment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getComment
+	 * <em>Comment</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Comment</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFHeader#getComment()
 	 * @see #getReqIFHeader()
@@ -3705,9 +3520,9 @@
 	EAttribute getReqIFHeader_Comment();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getCreationTime <em>Creation Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getCreationTime
+	 * <em>Creation Time</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Creation Time</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFHeader#getCreationTime()
 	 * @see #getReqIFHeader()
@@ -3716,9 +3531,9 @@
 	EAttribute getReqIFHeader_CreationTime();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getIdentifier <em>Identifier</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getIdentifier
+	 * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Identifier</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFHeader#getIdentifier()
 	 * @see #getReqIFHeader()
@@ -3727,9 +3542,9 @@
 	EAttribute getReqIFHeader_Identifier();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getRepositoryId <em>Repository Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getRepositoryId
+	 * <em>Repository Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Repository Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFHeader#getRepositoryId()
 	 * @see #getReqIFHeader()
@@ -3738,9 +3553,9 @@
 	EAttribute getReqIFHeader_RepositoryId();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFToolId <em>Req IF Tool Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFToolId
+	 * <em>Req IF Tool Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Req IF Tool Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFToolId()
 	 * @see #getReqIFHeader()
@@ -3749,9 +3564,9 @@
 	EAttribute getReqIFHeader_ReqIFToolId();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFVersion <em>Req IF Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFVersion
+	 * <em>Req IF Version</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Req IF Version</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFVersion()
 	 * @see #getReqIFHeader()
@@ -3760,9 +3575,9 @@
 	EAttribute getReqIFHeader_ReqIFVersion();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getSourceToolId <em>Source Tool Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getSourceToolId
+	 * <em>Source Tool Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Source Tool Id</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFHeader#getSourceToolId()
 	 * @see #getReqIFHeader()
@@ -3772,8 +3587,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFHeader#getTitle()
 	 * @see #getReqIFHeader()
@@ -3782,9 +3597,9 @@
 	EAttribute getReqIFHeader_Title();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.ReqIFToolExtension <em>Req IF Tool Extension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.ReqIFToolExtension
+	 * <em>Req IF Tool Extension</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Req IF Tool Extension</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFToolExtension
 	 * @generated
@@ -3792,9 +3607,10 @@
 	EClass getReqIFToolExtension();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.ReqIFToolExtension#getExtensions <em>Extensions</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.ReqIFToolExtension#getExtensions <em>Extensions</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Extensions</em>'.
 	 * @see org.eclipse.rmf.reqif10.ReqIFToolExtension#getExtensions()
 	 * @see #getReqIFToolExtension()
@@ -3803,9 +3619,9 @@
 	EReference getReqIFToolExtension_Extensions();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.SpecObject <em>Spec Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.SpecObject <em>Spec Object</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Spec Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecObject
 	 * @generated
@@ -3814,8 +3630,8 @@
 
 	/**
 	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.SpecObject#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecObject#getType()
 	 * @see #getSpecObject()
@@ -3825,8 +3641,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.SpecObjectType <em>Spec Object Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Spec Object Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecObjectType
 	 * @generated
@@ -3834,9 +3650,9 @@
 	EClass getSpecObjectType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.Specification <em>Specification</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.Specification <em>Specification</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Specification</em>'.
 	 * @see org.eclipse.rmf.reqif10.Specification
 	 * @generated
@@ -3845,8 +3661,8 @@
 
 	/**
 	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.Specification#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.Specification#getType()
 	 * @see #getSpecification()
@@ -3855,9 +3671,10 @@
 	EReference getSpecification_Type();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.Specification#getChildren <em>Children</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.Specification#getChildren <em>Children</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Children</em>'.
 	 * @see org.eclipse.rmf.reqif10.Specification#getChildren()
 	 * @see #getSpecification()
@@ -3866,9 +3683,9 @@
 	EReference getSpecification_Children();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.SpecificationType <em>Specification Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.SpecificationType <em>Specification Type</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Specification Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecificationType
 	 * @generated
@@ -3876,9 +3693,9 @@
 	EClass getSpecificationType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.SpecHierarchy <em>Spec Hierarchy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.SpecHierarchy <em>Spec Hierarchy</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Spec Hierarchy</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecHierarchy
 	 * @generated
@@ -3886,9 +3703,9 @@
 	EClass getSpecHierarchy();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.SpecHierarchy#isTableInternal <em>Table Internal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.SpecHierarchy#isTableInternal
+	 * <em>Table Internal</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Table Internal</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecHierarchy#isTableInternal()
 	 * @see #getSpecHierarchy()
@@ -3897,9 +3714,9 @@
 	EAttribute getSpecHierarchy_TableInternal();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getObject
+	 * <em>Object</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Object</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecHierarchy#getObject()
 	 * @see #getSpecHierarchy()
@@ -3908,9 +3725,10 @@
 	EReference getSpecHierarchy_Object();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getChildren <em>Children</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.SpecHierarchy#getChildren <em>Children</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Children</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecHierarchy#getChildren()
 	 * @see #getSpecHierarchy()
@@ -3919,9 +3737,9 @@
 	EReference getSpecHierarchy_Children();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getEditableAtts <em>Editable Atts</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getEditableAtts
+	 * <em>Editable Atts</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Editable Atts</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecHierarchy#getEditableAtts()
 	 * @see #getSpecHierarchy()
@@ -3930,9 +3748,9 @@
 	EReference getSpecHierarchy_EditableAtts();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinition <em>Datatype Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinition
+	 * <em>Datatype Definition</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Datatype Definition</em>'.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinition
 	 * @generated
@@ -3940,9 +3758,9 @@
 	EClass getDatatypeDefinition();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.SpecRelation <em>Spec Relation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.SpecRelation <em>Spec Relation</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Spec Relation</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecRelation
 	 * @generated
@@ -3950,9 +3768,9 @@
 	EClass getSpecRelation();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.SpecRelation#getTarget <em>Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.SpecRelation#getTarget <em>Target</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Target</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecRelation#getTarget()
 	 * @see #getSpecRelation()
@@ -3961,9 +3779,9 @@
 	EReference getSpecRelation_Target();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.SpecRelation#getSource <em>Source</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.SpecRelation#getSource <em>Source</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Source</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecRelation#getSource()
 	 * @see #getSpecRelation()
@@ -3973,8 +3791,8 @@
 
 	/**
 	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.SpecRelation#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecRelation#getType()
 	 * @see #getSpecRelation()
@@ -3984,8 +3802,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.SpecRelationType <em>Spec Relation Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Spec Relation Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.SpecRelationType
 	 * @generated
@@ -3993,9 +3811,9 @@
 	EClass getSpecRelationType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.RelationGroup <em>Relation Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.RelationGroup <em>Relation Group</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Relation Group</em>'.
 	 * @see org.eclipse.rmf.reqif10.RelationGroup
 	 * @generated
@@ -4003,9 +3821,9 @@
 	EClass getRelationGroup();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.rmf.reqif10.RelationGroup#getSpecRelations <em>Spec Relations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list '{@link org.eclipse.rmf.reqif10.RelationGroup#getSpecRelations
+	 * <em>Spec Relations</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Spec Relations</em>'.
 	 * @see org.eclipse.rmf.reqif10.RelationGroup#getSpecRelations()
 	 * @see #getRelationGroup()
@@ -4015,8 +3833,8 @@
 
 	/**
 	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.RelationGroup#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.RelationGroup#getType()
 	 * @see #getRelationGroup()
@@ -4025,9 +3843,9 @@
 	EReference getRelationGroup_Type();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.RelationGroup#getSourceSpecification <em>Source Specification</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.RelationGroup#getSourceSpecification
+	 * <em>Source Specification</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Source Specification</em>'.
 	 * @see org.eclipse.rmf.reqif10.RelationGroup#getSourceSpecification()
 	 * @see #getRelationGroup()
@@ -4036,9 +3854,9 @@
 	EReference getRelationGroup_SourceSpecification();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.RelationGroup#getTargetSpecification <em>Target Specification</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.RelationGroup#getTargetSpecification
+	 * <em>Target Specification</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Target Specification</em>'.
 	 * @see org.eclipse.rmf.reqif10.RelationGroup#getTargetSpecification()
 	 * @see #getRelationGroup()
@@ -4047,9 +3865,9 @@
 	EReference getRelationGroup_TargetSpecification();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.RelationGroupType <em>Relation Group Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.RelationGroupType <em>Relation Group Type</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Relation Group Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.RelationGroupType
 	 * @generated
@@ -4057,9 +3875,9 @@
 	EClass getRelationGroupType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML <em>Datatype Definition XHTML</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML
+	 * <em>Datatype Definition XHTML</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Datatype Definition XHTML</em>'.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML
 	 * @generated
@@ -4067,9 +3885,9 @@
 	EClass getDatatypeDefinitionXHTML();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AlternativeID <em>Alternative ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AlternativeID <em>Alternative ID</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Alternative ID</em>'.
 	 * @see org.eclipse.rmf.reqif10.AlternativeID
 	 * @generated
@@ -4077,9 +3895,9 @@
 	EClass getAlternativeID();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AlternativeID#getIdentifier <em>Identifier</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AlternativeID#getIdentifier
+	 * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Identifier</em>'.
 	 * @see org.eclipse.rmf.reqif10.AlternativeID#getIdentifier()
 	 * @see #getAlternativeID()
@@ -4088,9 +3906,9 @@
 	EAttribute getAlternativeID_Identifier();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean <em>Attribute Definition Boolean</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean
+	 * <em>Attribute Definition Boolean</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Definition Boolean</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionBoolean
 	 * @generated
@@ -4098,9 +3916,9 @@
 	EClass getAttributeDefinitionBoolean();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getType
+	 * <em>Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getType()
 	 * @see #getAttributeDefinitionBoolean()
@@ -4109,9 +3927,10 @@
 	EReference getAttributeDefinitionBoolean_Type();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getDefaultValue <em>Default Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getDefaultValue <em>Default Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Default Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionBoolean#getDefaultValue()
 	 * @see #getAttributeDefinitionBoolean()
@@ -4120,9 +3939,9 @@
 	EReference getAttributeDefinitionBoolean_DefaultValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionSimple <em>Attribute Definition Simple</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionSimple
+	 * <em>Attribute Definition Simple</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Definition Simple</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionSimple
 	 * @generated
@@ -4130,9 +3949,9 @@
 	EClass getAttributeDefinitionSimple();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean <em>Datatype Definition Boolean</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean
+	 * <em>Datatype Definition Boolean</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Datatype Definition Boolean</em>'.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean
 	 * @generated
@@ -4140,9 +3959,9 @@
 	EClass getDatatypeDefinitionBoolean();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionSimple <em>Datatype Definition Simple</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionSimple
+	 * <em>Datatype Definition Simple</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Datatype Definition Simple</em>'.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionSimple
 	 * @generated
@@ -4150,9 +3969,9 @@
 	EClass getDatatypeDefinitionSimple();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean <em>Attribute Value Boolean</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean
+	 * <em>Attribute Value Boolean</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Value Boolean</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueBoolean
 	 * @generated
@@ -4160,9 +3979,9 @@
 	EClass getAttributeValueBoolean();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#isTheValue <em>The Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#isTheValue
+	 * <em>The Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>The Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueBoolean#isTheValue()
 	 * @see #getAttributeValueBoolean()
@@ -4171,9 +3990,9 @@
 	EAttribute getAttributeValueBoolean_TheValue();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#getDefinition <em>Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean#getDefinition
+	 * <em>Definition</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Definition</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueBoolean#getDefinition()
 	 * @see #getAttributeValueBoolean()
@@ -4182,9 +4001,9 @@
 	EReference getAttributeValueBoolean_Definition();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValueSimple <em>Attribute Value Simple</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValueSimple
+	 * <em>Attribute Value Simple</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Value Simple</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueSimple
 	 * @generated
@@ -4192,9 +4011,9 @@
 	EClass getAttributeValueSimple();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate <em>Attribute Definition Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate
+	 * <em>Attribute Definition Date</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Definition Date</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionDate
 	 * @generated
@@ -4202,9 +4021,9 @@
 	EClass getAttributeDefinitionDate();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getType
+	 * <em>Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionDate#getType()
 	 * @see #getAttributeDefinitionDate()
@@ -4213,9 +4032,10 @@
 	EReference getAttributeDefinitionDate_Type();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getDefaultValue <em>Default Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.rmf.reqif10.AttributeDefinitionDate#getDefaultValue <em>Default Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Default Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionDate#getDefaultValue()
 	 * @see #getAttributeDefinitionDate()
@@ -4224,9 +4044,9 @@
 	EReference getAttributeDefinitionDate_DefaultValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionDate <em>Datatype Definition Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionDate
+	 * <em>Datatype Definition Date</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Datatype Definition Date</em>'.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionDate
 	 * @generated
@@ -4234,9 +4054,9 @@
 	EClass getDatatypeDefinitionDate();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValueDate <em>Attribute Value Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValueDate
+	 * <em>Attribute Value Date</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Value Date</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueDate
 	 * @generated
@@ -4244,9 +4064,9 @@
 	EClass getAttributeValueDate();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AttributeValueDate#getTheValue <em>The Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AttributeValueDate#getTheValue
+	 * <em>The Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>The Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueDate#getTheValue()
 	 * @see #getAttributeValueDate()
@@ -4255,9 +4075,9 @@
 	EAttribute getAttributeValueDate_TheValue();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeValueDate#getDefinition <em>Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeValueDate#getDefinition
+	 * <em>Definition</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Definition</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueDate#getDefinition()
 	 * @see #getAttributeValueDate()
@@ -4266,9 +4086,9 @@
 	EReference getAttributeValueDate_Definition();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration <em>Attribute Definition Enumeration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration
+	 * <em>Attribute Definition Enumeration</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Definition Enumeration</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration
 	 * @generated
@@ -4276,9 +4096,10 @@
 	EClass getAttributeDefinitionEnumeration();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#isMultiValued <em>Multi Valued</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#isMultiValued <em>Multi Valued</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Multi Valued</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#isMultiValued()
 	 * @see #getAttributeDefinitionEnumeration()
@@ -4287,9 +4108,9 @@
 	EAttribute getAttributeDefinitionEnumeration_MultiValued();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getType
+	 * <em>Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getType()
 	 * @see #getAttributeDefinitionEnumeration()
@@ -4298,9 +4119,10 @@
 	EReference getAttributeDefinitionEnumeration_Type();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getDefaultValue <em>Default Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getDefaultValue <em>Default Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Default Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration#getDefaultValue()
 	 * @see #getAttributeDefinitionEnumeration()
@@ -4309,9 +4131,9 @@
 	EReference getAttributeDefinitionEnumeration_DefaultValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration <em>Datatype Definition Enumeration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration
+	 * <em>Datatype Definition Enumeration</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Datatype Definition Enumeration</em>'.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration
 	 * @generated
@@ -4319,9 +4141,10 @@
 	EClass getDatatypeDefinitionEnumeration();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration#getSpecifiedValues <em>Specified Values</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration#getSpecifiedValues <em>Specified Values</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Specified Values</em>'.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration#getSpecifiedValues()
 	 * @see #getDatatypeDefinitionEnumeration()
@@ -4330,9 +4153,9 @@
 	EReference getDatatypeDefinitionEnumeration_SpecifiedValues();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.EnumValue <em>Enum Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.EnumValue <em>Enum Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Enum Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.EnumValue
 	 * @generated
@@ -4340,9 +4163,9 @@
 	EClass getEnumValue();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.EnumValue#getProperties <em>Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.EnumValue#getProperties
+	 * <em>Properties</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Properties</em>'.
 	 * @see org.eclipse.rmf.reqif10.EnumValue#getProperties()
 	 * @see #getEnumValue()
@@ -4351,9 +4174,9 @@
 	EReference getEnumValue_Properties();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.EmbeddedValue <em>Embedded Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.EmbeddedValue <em>Embedded Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Embedded Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.EmbeddedValue
 	 * @generated
@@ -4362,8 +4185,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.EmbeddedValue#getKey <em>Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Key</em>'.
 	 * @see org.eclipse.rmf.reqif10.EmbeddedValue#getKey()
 	 * @see #getEmbeddedValue()
@@ -4372,9 +4195,9 @@
 	EAttribute getEmbeddedValue_Key();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.EmbeddedValue#getOtherContent <em>Other Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.EmbeddedValue#getOtherContent
+	 * <em>Other Content</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Other Content</em>'.
 	 * @see org.eclipse.rmf.reqif10.EmbeddedValue#getOtherContent()
 	 * @see #getEmbeddedValue()
@@ -4383,9 +4206,9 @@
 	EAttribute getEmbeddedValue_OtherContent();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration <em>Attribute Value Enumeration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration
+	 * <em>Attribute Value Enumeration</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Value Enumeration</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueEnumeration
 	 * @generated
@@ -4393,9 +4216,10 @@
 	EClass getAttributeValueEnumeration();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getValues <em>Values</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getValues <em>Values</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Values</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueEnumeration#getValues()
 	 * @see #getAttributeValueEnumeration()
@@ -4404,9 +4228,10 @@
 	EReference getAttributeValueEnumeration_Values();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getDefinition <em>Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.rmf.reqif10.AttributeValueEnumeration#getDefinition <em>Definition</em>}'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Definition</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueEnumeration#getDefinition()
 	 * @see #getAttributeValueEnumeration()
@@ -4415,9 +4240,9 @@
 	EReference getAttributeValueEnumeration_Definition();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger <em>Attribute Definition Integer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger
+	 * <em>Attribute Definition Integer</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Definition Integer</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionInteger
 	 * @generated
@@ -4425,9 +4250,9 @@
 	EClass getAttributeDefinitionInteger();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getType
+	 * <em>Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getType()
 	 * @see #getAttributeDefinitionInteger()
@@ -4436,9 +4261,10 @@
 	EReference getAttributeDefinitionInteger_Type();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getDefaultValue <em>Default Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getDefaultValue <em>Default Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Default Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionInteger#getDefaultValue()
 	 * @see #getAttributeDefinitionInteger()
@@ -4447,9 +4273,9 @@
 	EReference getAttributeDefinitionInteger_DefaultValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger <em>Datatype Definition Integer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger
+	 * <em>Datatype Definition Integer</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Datatype Definition Integer</em>'.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionInteger
 	 * @generated
@@ -4457,9 +4283,9 @@
 	EClass getDatatypeDefinitionInteger();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMax <em>Max</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMax
+	 * <em>Max</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Max</em>'.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMax()
 	 * @see #getDatatypeDefinitionInteger()
@@ -4468,9 +4294,9 @@
 	EAttribute getDatatypeDefinitionInteger_Max();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMin <em>Min</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMin
+	 * <em>Min</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Min</em>'.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionInteger#getMin()
 	 * @see #getDatatypeDefinitionInteger()
@@ -4479,9 +4305,9 @@
 	EAttribute getDatatypeDefinitionInteger_Min();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValueInteger <em>Attribute Value Integer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValueInteger
+	 * <em>Attribute Value Integer</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Value Integer</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueInteger
 	 * @generated
@@ -4489,9 +4315,9 @@
 	EClass getAttributeValueInteger();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getTheValue <em>The Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getTheValue
+	 * <em>The Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>The Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueInteger#getTheValue()
 	 * @see #getAttributeValueInteger()
@@ -4500,9 +4326,9 @@
 	EAttribute getAttributeValueInteger_TheValue();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getDefinition <em>Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeValueInteger#getDefinition
+	 * <em>Definition</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Definition</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueInteger#getDefinition()
 	 * @see #getAttributeValueInteger()
@@ -4511,9 +4337,9 @@
 	EReference getAttributeValueInteger_Definition();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal <em>Attribute Definition Real</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal
+	 * <em>Attribute Definition Real</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Definition Real</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionReal
 	 * @generated
@@ -4521,9 +4347,9 @@
 	EClass getAttributeDefinitionReal();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getType
+	 * <em>Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionReal#getType()
 	 * @see #getAttributeDefinitionReal()
@@ -4532,9 +4358,10 @@
 	EReference getAttributeDefinitionReal_Type();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getDefaultValue <em>Default Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.rmf.reqif10.AttributeDefinitionReal#getDefaultValue <em>Default Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Default Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionReal#getDefaultValue()
 	 * @see #getAttributeDefinitionReal()
@@ -4543,9 +4370,9 @@
 	EReference getAttributeDefinitionReal_DefaultValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal <em>Datatype Definition Real</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal
+	 * <em>Datatype Definition Real</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Datatype Definition Real</em>'.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionReal
 	 * @generated
@@ -4553,9 +4380,9 @@
 	EClass getDatatypeDefinitionReal();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getAccuracy <em>Accuracy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getAccuracy
+	 * <em>Accuracy</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Accuracy</em>'.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getAccuracy()
 	 * @see #getDatatypeDefinitionReal()
@@ -4564,9 +4391,9 @@
 	EAttribute getDatatypeDefinitionReal_Accuracy();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMax <em>Max</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMax
+	 * <em>Max</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Max</em>'.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMax()
 	 * @see #getDatatypeDefinitionReal()
@@ -4575,9 +4402,9 @@
 	EAttribute getDatatypeDefinitionReal_Max();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMin <em>Min</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMin
+	 * <em>Min</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Min</em>'.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionReal#getMin()
 	 * @see #getDatatypeDefinitionReal()
@@ -4586,9 +4413,9 @@
 	EAttribute getDatatypeDefinitionReal_Min();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValueReal <em>Attribute Value Real</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValueReal
+	 * <em>Attribute Value Real</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Value Real</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueReal
 	 * @generated
@@ -4596,9 +4423,9 @@
 	EClass getAttributeValueReal();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AttributeValueReal#getTheValue <em>The Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AttributeValueReal#getTheValue
+	 * <em>The Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>The Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueReal#getTheValue()
 	 * @see #getAttributeValueReal()
@@ -4607,9 +4434,9 @@
 	EAttribute getAttributeValueReal_TheValue();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeValueReal#getDefinition <em>Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeValueReal#getDefinition
+	 * <em>Definition</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Definition</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueReal#getDefinition()
 	 * @see #getAttributeValueReal()
@@ -4618,9 +4445,9 @@
 	EReference getAttributeValueReal_Definition();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString <em>Attribute Definition String</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString
+	 * <em>Attribute Definition String</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Definition String</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionString
 	 * @generated
@@ -4628,9 +4455,9 @@
 	EClass getAttributeDefinitionString();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getType
+	 * <em>Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Type</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionString#getType()
 	 * @see #getAttributeDefinitionString()
@@ -4639,9 +4466,10 @@
 	EReference getAttributeDefinitionString_Type();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getDefaultValue <em>Default Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.rmf.reqif10.AttributeDefinitionString#getDefaultValue <em>Default Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Default Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionString#getDefaultValue()
 	 * @see #getAttributeDefinitionString()
@@ -4650,9 +4478,9 @@
 	EReference getAttributeDefinitionString_DefaultValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionString <em>Datatype Definition String</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionString
+	 * <em>Datatype Definition String</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Datatype Definition String</em>'.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionString
 	 * @generated
@@ -4660,9 +4488,9 @@
 	EClass getDatatypeDefinitionString();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionString#getMaxLength <em>Max Length</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionString#getMaxLength
+	 * <em>Max Length</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Max Length</em>'.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionString#getMaxLength()
 	 * @see #getDatatypeDefinitionString()
@@ -4671,9 +4499,9 @@
 	EAttribute getDatatypeDefinitionString_MaxLength();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValueString <em>Attribute Value String</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.AttributeValueString
+	 * <em>Attribute Value String</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Attribute Value String</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueString
 	 * @generated
@@ -4681,9 +4509,9 @@
 	EClass getAttributeValueString();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AttributeValueString#getTheValue <em>The Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.AttributeValueString#getTheValue
+	 * <em>The Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>The Value</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueString#getTheValue()
 	 * @see #getAttributeValueString()
@@ -4692,9 +4520,9 @@
 	EAttribute getAttributeValueString_TheValue();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeValueString#getDefinition <em>Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.rmf.reqif10.AttributeValueString#getDefinition
+	 * <em>Definition</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Definition</em>'.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueString#getDefinition()
 	 * @see #getAttributeValueString()
@@ -4703,9 +4531,9 @@
 	EReference getAttributeValueString_Definition();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.XhtmlContent <em>Xhtml Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.XhtmlContent <em>Xhtml Content</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Xhtml Content</em>'.
 	 * @see org.eclipse.rmf.reqif10.XhtmlContent
 	 * @generated
@@ -4713,9 +4541,9 @@
 	EClass getXhtmlContent();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtml <em>Xhtml</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtml
+	 * <em>Xhtml</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Xhtml</em>'.
 	 * @see org.eclipse.rmf.reqif10.XhtmlContent#getXhtml()
 	 * @see #getXhtmlContent()
@@ -4724,9 +4552,9 @@
 	EReference getXhtmlContent_Xhtml();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtmlSource <em>Xhtml Source</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtmlSource
+	 * <em>Xhtml Source</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Xhtml Source</em>'.
 	 * @see org.eclipse.rmf.reqif10.XhtmlContent#getXhtmlSource()
 	 * @see #getXhtmlContent()
@@ -4735,9 +4563,9 @@
 	EAttribute getXhtmlContent_XhtmlSource();
 
 	/**
-	 * Returns the meta object for data type '{@link java.util.GregorianCalendar <em>Date Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.util.GregorianCalendar <em>Date Time</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Date Time</em>'.
 	 * @see java.util.GregorianCalendar
 	 * @model instanceClass="java.util.GregorianCalendar"
@@ -4746,9 +4574,9 @@
 	EDataType getDateTime();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>ID</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>ID</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -4757,31 +4585,30 @@
 	EDataType getID();
 
 	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
 	ReqIF10Factory getReqIF10Factory();
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
+	 * <!-- begin-user-doc --> Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AccessControlledElementImpl <em>Access Controlled Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AccessControlledElementImpl
+		 * <em>Access Controlled Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AccessControlledElementImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAccessControlledElement()
 		 * @generated
@@ -4789,17 +4616,17 @@
 		EClass ACCESS_CONTROLLED_ELEMENT = eINSTANCE.getAccessControlledElement();
 
 		/**
-		 * The meta object literal for the '<em><b>Editable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Editable</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ACCESS_CONTROLLED_ELEMENT__EDITABLE = eINSTANCE.getAccessControlledElement_Editable();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.IdentifiableImpl <em>Identifiable</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.IdentifiableImpl <em>Identifiable</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.IdentifiableImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getIdentifiable()
 		 * @generated
@@ -4807,49 +4634,49 @@
 		EClass IDENTIFIABLE = eINSTANCE.getIdentifiable();
 
 		/**
-		 * The meta object literal for the '<em><b>Desc</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Desc</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute IDENTIFIABLE__DESC = eINSTANCE.getIdentifiable_Desc();
 
 		/**
-		 * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute IDENTIFIABLE__IDENTIFIER = eINSTANCE.getIdentifiable_Identifier();
 
 		/**
-		 * The meta object literal for the '<em><b>Last Change</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Last Change</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute IDENTIFIABLE__LAST_CHANGE = eINSTANCE.getIdentifiable_LastChange();
 
 		/**
-		 * The meta object literal for the '<em><b>Long Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Long Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute IDENTIFIABLE__LONG_NAME = eINSTANCE.getIdentifiable_LongName();
 
 		/**
-		 * The meta object literal for the '<em><b>Alternative ID</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Alternative ID</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference IDENTIFIABLE__ALTERNATIVE_ID = eINSTANCE.getIdentifiable_AlternativeID();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueXHTMLImpl <em>Attribute Value XHTML</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueXHTMLImpl
+		 * <em>Attribute Value XHTML</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeValueXHTMLImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValueXHTML()
 		 * @generated
@@ -4857,41 +4684,41 @@
 		EClass ATTRIBUTE_VALUE_XHTML = eINSTANCE.getAttributeValueXHTML();
 
 		/**
-		 * The meta object literal for the '<em><b>Simplified</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Simplified</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ATTRIBUTE_VALUE_XHTML__SIMPLIFIED = eINSTANCE.getAttributeValueXHTML_Simplified();
 
 		/**
-		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_VALUE_XHTML__DEFINITION = eINSTANCE.getAttributeValueXHTML_Definition();
 
 		/**
-		 * The meta object literal for the '<em><b>The Original Value</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>The Original Value</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE = eINSTANCE.getAttributeValueXHTML_TheOriginalValue();
 
 		/**
-		 * The meta object literal for the '<em><b>The Value</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>The Value</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_VALUE_XHTML__THE_VALUE = eINSTANCE.getAttributeValueXHTML_TheValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueImpl <em>Attribute Value</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueImpl
+		 * <em>Attribute Value</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeValueImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValue()
 		 * @generated
@@ -4899,9 +4726,9 @@
 		EClass ATTRIBUTE_VALUE = eINSTANCE.getAttributeValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecElementWithAttributesImpl <em>Spec Element With Attributes</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecElementWithAttributesImpl
+		 * <em>Spec Element With Attributes</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.SpecElementWithAttributesImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecElementWithAttributes()
 		 * @generated
@@ -4909,17 +4736,17 @@
 		EClass SPEC_ELEMENT_WITH_ATTRIBUTES = eINSTANCE.getSpecElementWithAttributes();
 
 		/**
-		 * The meta object literal for the '<em><b>Values</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Values</b></em>' containment reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES = eINSTANCE.getSpecElementWithAttributes_Values();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionXHTMLImpl <em>Attribute Definition XHTML</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionXHTMLImpl
+		 * <em>Attribute Definition XHTML</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionXHTMLImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinitionXHTML()
 		 * @generated
@@ -4927,25 +4754,25 @@
 		EClass ATTRIBUTE_DEFINITION_XHTML = eINSTANCE.getAttributeDefinitionXHTML();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Type</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_DEFINITION_XHTML__TYPE = eINSTANCE.getAttributeDefinitionXHTML_Type();
 
 		/**
-		 * The meta object literal for the '<em><b>Default Value</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Default Value</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE = eINSTANCE.getAttributeDefinitionXHTML_DefaultValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionImpl <em>Attribute Definition</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionImpl
+		 * <em>Attribute Definition</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinition()
 		 * @generated
@@ -4954,8 +4781,8 @@
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecTypeImpl <em>Spec Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.SpecTypeImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecType()
 		 * @generated
@@ -4963,17 +4790,17 @@
 		EClass SPEC_TYPE = eINSTANCE.getSpecType();
 
 		/**
-		 * The meta object literal for the '<em><b>Spec Attributes</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Spec Attributes</b></em>' containment reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SPEC_TYPE__SPEC_ATTRIBUTES = eINSTANCE.getSpecType_SpecAttributes();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.ReqIFContentImpl <em>Req IF Content</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.ReqIFContentImpl
+		 * <em>Req IF Content</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIFContentImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getReqIFContent()
 		 * @generated
@@ -4981,57 +4808,57 @@
 		EClass REQ_IF_CONTENT = eINSTANCE.getReqIFContent();
 
 		/**
-		 * The meta object literal for the '<em><b>Datatypes</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Datatypes</b></em>' containment reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference REQ_IF_CONTENT__DATATYPES = eINSTANCE.getReqIFContent_Datatypes();
 
 		/**
-		 * The meta object literal for the '<em><b>Spec Types</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Spec Types</b></em>' containment reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference REQ_IF_CONTENT__SPEC_TYPES = eINSTANCE.getReqIFContent_SpecTypes();
 
 		/**
-		 * The meta object literal for the '<em><b>Spec Objects</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Spec Objects</b></em>' containment reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference REQ_IF_CONTENT__SPEC_OBJECTS = eINSTANCE.getReqIFContent_SpecObjects();
 
 		/**
-		 * The meta object literal for the '<em><b>Spec Relations</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Spec Relations</b></em>' containment reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference REQ_IF_CONTENT__SPEC_RELATIONS = eINSTANCE.getReqIFContent_SpecRelations();
 
 		/**
-		 * The meta object literal for the '<em><b>Specifications</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Specifications</b></em>' containment reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference REQ_IF_CONTENT__SPECIFICATIONS = eINSTANCE.getReqIFContent_Specifications();
 
 		/**
 		 * The meta object literal for the '<em><b>Spec Relation Groups</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference REQ_IF_CONTENT__SPEC_RELATION_GROUPS = eINSTANCE.getReqIFContent_SpecRelationGroups();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.ReqIFImpl <em>Req IF</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.ReqIFImpl <em>Req IF</em>}' class. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIFImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getReqIF()
 		 * @generated
@@ -5039,41 +4866,41 @@
 		EClass REQ_IF = eINSTANCE.getReqIF();
 
 		/**
-		 * The meta object literal for the '<em><b>Lang</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Lang</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute REQ_IF__LANG = eINSTANCE.getReqIF_Lang();
 
 		/**
-		 * The meta object literal for the '<em><b>The Header</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>The Header</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference REQ_IF__THE_HEADER = eINSTANCE.getReqIF_TheHeader();
 
 		/**
-		 * The meta object literal for the '<em><b>Core Content</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Core Content</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference REQ_IF__CORE_CONTENT = eINSTANCE.getReqIF_CoreContent();
 
 		/**
-		 * The meta object literal for the '<em><b>Tool Extensions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Tool Extensions</b></em>' containment reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference REQ_IF__TOOL_EXTENSIONS = eINSTANCE.getReqIF_ToolExtensions();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl <em>Req IF Header</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl <em>Req IF Header</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getReqIFHeader()
 		 * @generated
@@ -5081,73 +4908,73 @@
 		EClass REQ_IF_HEADER = eINSTANCE.getReqIFHeader();
 
 		/**
-		 * The meta object literal for the '<em><b>Comment</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Comment</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute REQ_IF_HEADER__COMMENT = eINSTANCE.getReqIFHeader_Comment();
 
 		/**
-		 * The meta object literal for the '<em><b>Creation Time</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Creation Time</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute REQ_IF_HEADER__CREATION_TIME = eINSTANCE.getReqIFHeader_CreationTime();
 
 		/**
-		 * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute REQ_IF_HEADER__IDENTIFIER = eINSTANCE.getReqIFHeader_Identifier();
 
 		/**
-		 * The meta object literal for the '<em><b>Repository Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Repository Id</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute REQ_IF_HEADER__REPOSITORY_ID = eINSTANCE.getReqIFHeader_RepositoryId();
 
 		/**
-		 * The meta object literal for the '<em><b>Req IF Tool Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Req IF Tool Id</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute REQ_IF_HEADER__REQ_IF_TOOL_ID = eINSTANCE.getReqIFHeader_ReqIFToolId();
 
 		/**
-		 * The meta object literal for the '<em><b>Req IF Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Req IF Version</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute REQ_IF_HEADER__REQ_IF_VERSION = eINSTANCE.getReqIFHeader_ReqIFVersion();
 
 		/**
-		 * The meta object literal for the '<em><b>Source Tool Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Source Tool Id</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute REQ_IF_HEADER__SOURCE_TOOL_ID = eINSTANCE.getReqIFHeader_SourceToolId();
 
 		/**
-		 * The meta object literal for the '<em><b>Title</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Title</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute REQ_IF_HEADER__TITLE = eINSTANCE.getReqIFHeader_Title();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.ReqIFToolExtensionImpl <em>Req IF Tool Extension</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.ReqIFToolExtensionImpl
+		 * <em>Req IF Tool Extension</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIFToolExtensionImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getReqIFToolExtension()
 		 * @generated
@@ -5155,17 +4982,17 @@
 		EClass REQ_IF_TOOL_EXTENSION = eINSTANCE.getReqIFToolExtension();
 
 		/**
-		 * The meta object literal for the '<em><b>Extensions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Extensions</b></em>' containment reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference REQ_IF_TOOL_EXTENSION__EXTENSIONS = eINSTANCE.getReqIFToolExtension_Extensions();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecObjectImpl <em>Spec Object</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecObjectImpl <em>Spec Object</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.SpecObjectImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecObject()
 		 * @generated
@@ -5173,17 +5000,17 @@
 		EClass SPEC_OBJECT = eINSTANCE.getSpecObject();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Type</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SPEC_OBJECT__TYPE = eINSTANCE.getSpecObject_Type();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecObjectTypeImpl <em>Spec Object Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecObjectTypeImpl
+		 * <em>Spec Object Type</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.SpecObjectTypeImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecObjectType()
 		 * @generated
@@ -5191,9 +5018,9 @@
 		EClass SPEC_OBJECT_TYPE = eINSTANCE.getSpecObjectType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecificationImpl <em>Specification</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecificationImpl
+		 * <em>Specification</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.SpecificationImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecification()
 		 * @generated
@@ -5201,25 +5028,25 @@
 		EClass SPECIFICATION = eINSTANCE.getSpecification();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Type</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SPECIFICATION__TYPE = eINSTANCE.getSpecification_Type();
 
 		/**
-		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SPECIFICATION__CHILDREN = eINSTANCE.getSpecification_Children();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecificationTypeImpl <em>Specification Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecificationTypeImpl
+		 * <em>Specification Type</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.SpecificationTypeImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecificationType()
 		 * @generated
@@ -5227,9 +5054,9 @@
 		EClass SPECIFICATION_TYPE = eINSTANCE.getSpecificationType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecHierarchyImpl <em>Spec Hierarchy</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecHierarchyImpl
+		 * <em>Spec Hierarchy</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.SpecHierarchyImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecHierarchy()
 		 * @generated
@@ -5237,41 +5064,41 @@
 		EClass SPEC_HIERARCHY = eINSTANCE.getSpecHierarchy();
 
 		/**
-		 * The meta object literal for the '<em><b>Table Internal</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Table Internal</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute SPEC_HIERARCHY__TABLE_INTERNAL = eINSTANCE.getSpecHierarchy_TableInternal();
 
 		/**
-		 * The meta object literal for the '<em><b>Object</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Object</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SPEC_HIERARCHY__OBJECT = eINSTANCE.getSpecHierarchy_Object();
 
 		/**
-		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SPEC_HIERARCHY__CHILDREN = eINSTANCE.getSpecHierarchy_Children();
 
 		/**
-		 * The meta object literal for the '<em><b>Editable Atts</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Editable Atts</b></em>' reference list feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SPEC_HIERARCHY__EDITABLE_ATTS = eINSTANCE.getSpecHierarchy_EditableAtts();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionImpl <em>Datatype Definition</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionImpl
+		 * <em>Datatype Definition</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinition()
 		 * @generated
@@ -5279,9 +5106,9 @@
 		EClass DATATYPE_DEFINITION = eINSTANCE.getDatatypeDefinition();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecRelationImpl <em>Spec Relation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecRelationImpl <em>Spec Relation</em>}
+		 * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.SpecRelationImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecRelation()
 		 * @generated
@@ -5289,33 +5116,33 @@
 		EClass SPEC_RELATION = eINSTANCE.getSpecRelation();
 
 		/**
-		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Target</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SPEC_RELATION__TARGET = eINSTANCE.getSpecRelation_Target();
 
 		/**
-		 * The meta object literal for the '<em><b>Source</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Source</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SPEC_RELATION__SOURCE = eINSTANCE.getSpecRelation_Source();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Type</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SPEC_RELATION__TYPE = eINSTANCE.getSpecRelation_Type();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecRelationTypeImpl <em>Spec Relation Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.SpecRelationTypeImpl
+		 * <em>Spec Relation Type</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.SpecRelationTypeImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getSpecRelationType()
 		 * @generated
@@ -5323,9 +5150,9 @@
 		EClass SPEC_RELATION_TYPE = eINSTANCE.getSpecRelationType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.RelationGroupImpl <em>Relation Group</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.RelationGroupImpl
+		 * <em>Relation Group</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.RelationGroupImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getRelationGroup()
 		 * @generated
@@ -5333,41 +5160,41 @@
 		EClass RELATION_GROUP = eINSTANCE.getRelationGroup();
 
 		/**
-		 * The meta object literal for the '<em><b>Spec Relations</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Spec Relations</b></em>' reference list feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference RELATION_GROUP__SPEC_RELATIONS = eINSTANCE.getRelationGroup_SpecRelations();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Type</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference RELATION_GROUP__TYPE = eINSTANCE.getRelationGroup_Type();
 
 		/**
-		 * The meta object literal for the '<em><b>Source Specification</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Source Specification</b></em>' reference feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference RELATION_GROUP__SOURCE_SPECIFICATION = eINSTANCE.getRelationGroup_SourceSpecification();
 
 		/**
-		 * The meta object literal for the '<em><b>Target Specification</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Target Specification</b></em>' reference feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference RELATION_GROUP__TARGET_SPECIFICATION = eINSTANCE.getRelationGroup_TargetSpecification();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.RelationGroupTypeImpl <em>Relation Group Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.RelationGroupTypeImpl
+		 * <em>Relation Group Type</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.RelationGroupTypeImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getRelationGroupType()
 		 * @generated
@@ -5375,9 +5202,9 @@
 		EClass RELATION_GROUP_TYPE = eINSTANCE.getRelationGroupType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionXHTMLImpl <em>Datatype Definition XHTML</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionXHTMLImpl
+		 * <em>Datatype Definition XHTML</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionXHTMLImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinitionXHTML()
 		 * @generated
@@ -5385,9 +5212,9 @@
 		EClass DATATYPE_DEFINITION_XHTML = eINSTANCE.getDatatypeDefinitionXHTML();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AlternativeIDImpl <em>Alternative ID</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AlternativeIDImpl
+		 * <em>Alternative ID</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AlternativeIDImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAlternativeID()
 		 * @generated
@@ -5395,17 +5222,17 @@
 		EClass ALTERNATIVE_ID = eINSTANCE.getAlternativeID();
 
 		/**
-		 * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ALTERNATIVE_ID__IDENTIFIER = eINSTANCE.getAlternativeID_Identifier();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionBooleanImpl <em>Attribute Definition Boolean</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionBooleanImpl
+		 * <em>Attribute Definition Boolean</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionBooleanImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinitionBoolean()
 		 * @generated
@@ -5413,25 +5240,25 @@
 		EClass ATTRIBUTE_DEFINITION_BOOLEAN = eINSTANCE.getAttributeDefinitionBoolean();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Type</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_DEFINITION_BOOLEAN__TYPE = eINSTANCE.getAttributeDefinitionBoolean_Type();
 
 		/**
-		 * The meta object literal for the '<em><b>Default Value</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Default Value</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE = eINSTANCE.getAttributeDefinitionBoolean_DefaultValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionSimpleImpl <em>Attribute Definition Simple</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionSimpleImpl
+		 * <em>Attribute Definition Simple</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionSimpleImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinitionSimple()
 		 * @generated
@@ -5439,9 +5266,9 @@
 		EClass ATTRIBUTE_DEFINITION_SIMPLE = eINSTANCE.getAttributeDefinitionSimple();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionBooleanImpl <em>Datatype Definition Boolean</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionBooleanImpl
+		 * <em>Datatype Definition Boolean</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionBooleanImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinitionBoolean()
 		 * @generated
@@ -5449,9 +5276,9 @@
 		EClass DATATYPE_DEFINITION_BOOLEAN = eINSTANCE.getDatatypeDefinitionBoolean();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionSimpleImpl <em>Datatype Definition Simple</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionSimpleImpl
+		 * <em>Datatype Definition Simple</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionSimpleImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinitionSimple()
 		 * @generated
@@ -5459,9 +5286,9 @@
 		EClass DATATYPE_DEFINITION_SIMPLE = eINSTANCE.getDatatypeDefinitionSimple();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueBooleanImpl <em>Attribute Value Boolean</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueBooleanImpl
+		 * <em>Attribute Value Boolean</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeValueBooleanImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValueBoolean()
 		 * @generated
@@ -5469,25 +5296,25 @@
 		EClass ATTRIBUTE_VALUE_BOOLEAN = eINSTANCE.getAttributeValueBoolean();
 
 		/**
-		 * The meta object literal for the '<em><b>The Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>The Value</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE = eINSTANCE.getAttributeValueBoolean_TheValue();
 
 		/**
-		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_VALUE_BOOLEAN__DEFINITION = eINSTANCE.getAttributeValueBoolean_Definition();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueSimpleImpl <em>Attribute Value Simple</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueSimpleImpl
+		 * <em>Attribute Value Simple</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeValueSimpleImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValueSimple()
 		 * @generated
@@ -5495,9 +5322,9 @@
 		EClass ATTRIBUTE_VALUE_SIMPLE = eINSTANCE.getAttributeValueSimple();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionDateImpl <em>Attribute Definition Date</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionDateImpl
+		 * <em>Attribute Definition Date</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionDateImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinitionDate()
 		 * @generated
@@ -5505,25 +5332,25 @@
 		EClass ATTRIBUTE_DEFINITION_DATE = eINSTANCE.getAttributeDefinitionDate();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Type</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_DEFINITION_DATE__TYPE = eINSTANCE.getAttributeDefinitionDate_Type();
 
 		/**
-		 * The meta object literal for the '<em><b>Default Value</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Default Value</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE = eINSTANCE.getAttributeDefinitionDate_DefaultValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionDateImpl <em>Datatype Definition Date</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionDateImpl
+		 * <em>Datatype Definition Date</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionDateImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinitionDate()
 		 * @generated
@@ -5531,9 +5358,9 @@
 		EClass DATATYPE_DEFINITION_DATE = eINSTANCE.getDatatypeDefinitionDate();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueDateImpl <em>Attribute Value Date</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueDateImpl
+		 * <em>Attribute Value Date</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeValueDateImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValueDate()
 		 * @generated
@@ -5541,25 +5368,25 @@
 		EClass ATTRIBUTE_VALUE_DATE = eINSTANCE.getAttributeValueDate();
 
 		/**
-		 * The meta object literal for the '<em><b>The Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>The Value</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ATTRIBUTE_VALUE_DATE__THE_VALUE = eINSTANCE.getAttributeValueDate_TheValue();
 
 		/**
-		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_VALUE_DATE__DEFINITION = eINSTANCE.getAttributeValueDate_Definition();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionEnumerationImpl <em>Attribute Definition Enumeration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionEnumerationImpl
+		 * <em>Attribute Definition Enumeration</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionEnumerationImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinitionEnumeration()
 		 * @generated
@@ -5567,33 +5394,33 @@
 		EClass ATTRIBUTE_DEFINITION_ENUMERATION = eINSTANCE.getAttributeDefinitionEnumeration();
 
 		/**
-		 * The meta object literal for the '<em><b>Multi Valued</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Multi Valued</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED = eINSTANCE.getAttributeDefinitionEnumeration_MultiValued();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Type</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_DEFINITION_ENUMERATION__TYPE = eINSTANCE.getAttributeDefinitionEnumeration_Type();
 
 		/**
-		 * The meta object literal for the '<em><b>Default Value</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Default Value</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE = eINSTANCE.getAttributeDefinitionEnumeration_DefaultValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionEnumerationImpl <em>Datatype Definition Enumeration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionEnumerationImpl
+		 * <em>Datatype Definition Enumeration</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionEnumerationImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinitionEnumeration()
 		 * @generated
@@ -5601,17 +5428,17 @@
 		EClass DATATYPE_DEFINITION_ENUMERATION = eINSTANCE.getDatatypeDefinitionEnumeration();
 
 		/**
-		 * The meta object literal for the '<em><b>Specified Values</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Specified Values</b></em>' containment reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES = eINSTANCE.getDatatypeDefinitionEnumeration_SpecifiedValues();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.EnumValueImpl <em>Enum Value</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.EnumValueImpl <em>Enum Value</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.EnumValueImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getEnumValue()
 		 * @generated
@@ -5619,17 +5446,17 @@
 		EClass ENUM_VALUE = eINSTANCE.getEnumValue();
 
 		/**
-		 * The meta object literal for the '<em><b>Properties</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Properties</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ENUM_VALUE__PROPERTIES = eINSTANCE.getEnumValue_Properties();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.EmbeddedValueImpl <em>Embedded Value</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.EmbeddedValueImpl
+		 * <em>Embedded Value</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.EmbeddedValueImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getEmbeddedValue()
 		 * @generated
@@ -5637,25 +5464,25 @@
 		EClass EMBEDDED_VALUE = eINSTANCE.getEmbeddedValue();
 
 		/**
-		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute EMBEDDED_VALUE__KEY = eINSTANCE.getEmbeddedValue_Key();
 
 		/**
-		 * The meta object literal for the '<em><b>Other Content</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Other Content</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute EMBEDDED_VALUE__OTHER_CONTENT = eINSTANCE.getEmbeddedValue_OtherContent();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueEnumerationImpl <em>Attribute Value Enumeration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueEnumerationImpl
+		 * <em>Attribute Value Enumeration</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeValueEnumerationImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValueEnumeration()
 		 * @generated
@@ -5663,25 +5490,25 @@
 		EClass ATTRIBUTE_VALUE_ENUMERATION = eINSTANCE.getAttributeValueEnumeration();
 
 		/**
-		 * The meta object literal for the '<em><b>Values</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Values</b></em>' reference list feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_VALUE_ENUMERATION__VALUES = eINSTANCE.getAttributeValueEnumeration_Values();
 
 		/**
-		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_VALUE_ENUMERATION__DEFINITION = eINSTANCE.getAttributeValueEnumeration_Definition();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionIntegerImpl <em>Attribute Definition Integer</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionIntegerImpl
+		 * <em>Attribute Definition Integer</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionIntegerImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinitionInteger()
 		 * @generated
@@ -5689,25 +5516,25 @@
 		EClass ATTRIBUTE_DEFINITION_INTEGER = eINSTANCE.getAttributeDefinitionInteger();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Type</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_DEFINITION_INTEGER__TYPE = eINSTANCE.getAttributeDefinitionInteger_Type();
 
 		/**
-		 * The meta object literal for the '<em><b>Default Value</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Default Value</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE = eINSTANCE.getAttributeDefinitionInteger_DefaultValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionIntegerImpl <em>Datatype Definition Integer</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionIntegerImpl
+		 * <em>Datatype Definition Integer</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionIntegerImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinitionInteger()
 		 * @generated
@@ -5715,25 +5542,25 @@
 		EClass DATATYPE_DEFINITION_INTEGER = eINSTANCE.getDatatypeDefinitionInteger();
 
 		/**
-		 * The meta object literal for the '<em><b>Max</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Max</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DATATYPE_DEFINITION_INTEGER__MAX = eINSTANCE.getDatatypeDefinitionInteger_Max();
 
 		/**
-		 * The meta object literal for the '<em><b>Min</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Min</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DATATYPE_DEFINITION_INTEGER__MIN = eINSTANCE.getDatatypeDefinitionInteger_Min();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueIntegerImpl <em>Attribute Value Integer</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueIntegerImpl
+		 * <em>Attribute Value Integer</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeValueIntegerImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValueInteger()
 		 * @generated
@@ -5741,25 +5568,25 @@
 		EClass ATTRIBUTE_VALUE_INTEGER = eINSTANCE.getAttributeValueInteger();
 
 		/**
-		 * The meta object literal for the '<em><b>The Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>The Value</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ATTRIBUTE_VALUE_INTEGER__THE_VALUE = eINSTANCE.getAttributeValueInteger_TheValue();
 
 		/**
-		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_VALUE_INTEGER__DEFINITION = eINSTANCE.getAttributeValueInteger_Definition();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionRealImpl <em>Attribute Definition Real</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionRealImpl
+		 * <em>Attribute Definition Real</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionRealImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinitionReal()
 		 * @generated
@@ -5767,25 +5594,25 @@
 		EClass ATTRIBUTE_DEFINITION_REAL = eINSTANCE.getAttributeDefinitionReal();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Type</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_DEFINITION_REAL__TYPE = eINSTANCE.getAttributeDefinitionReal_Type();
 
 		/**
-		 * The meta object literal for the '<em><b>Default Value</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Default Value</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE = eINSTANCE.getAttributeDefinitionReal_DefaultValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionRealImpl <em>Datatype Definition Real</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionRealImpl
+		 * <em>Datatype Definition Real</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionRealImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinitionReal()
 		 * @generated
@@ -5793,33 +5620,33 @@
 		EClass DATATYPE_DEFINITION_REAL = eINSTANCE.getDatatypeDefinitionReal();
 
 		/**
-		 * The meta object literal for the '<em><b>Accuracy</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Accuracy</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DATATYPE_DEFINITION_REAL__ACCURACY = eINSTANCE.getDatatypeDefinitionReal_Accuracy();
 
 		/**
-		 * The meta object literal for the '<em><b>Max</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Max</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DATATYPE_DEFINITION_REAL__MAX = eINSTANCE.getDatatypeDefinitionReal_Max();
 
 		/**
-		 * The meta object literal for the '<em><b>Min</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Min</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DATATYPE_DEFINITION_REAL__MIN = eINSTANCE.getDatatypeDefinitionReal_Min();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueRealImpl <em>Attribute Value Real</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueRealImpl
+		 * <em>Attribute Value Real</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeValueRealImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValueReal()
 		 * @generated
@@ -5827,25 +5654,25 @@
 		EClass ATTRIBUTE_VALUE_REAL = eINSTANCE.getAttributeValueReal();
 
 		/**
-		 * The meta object literal for the '<em><b>The Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>The Value</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ATTRIBUTE_VALUE_REAL__THE_VALUE = eINSTANCE.getAttributeValueReal_TheValue();
 
 		/**
-		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_VALUE_REAL__DEFINITION = eINSTANCE.getAttributeValueReal_Definition();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionStringImpl <em>Attribute Definition String</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionStringImpl
+		 * <em>Attribute Definition String</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeDefinitionStringImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeDefinitionString()
 		 * @generated
@@ -5853,25 +5680,25 @@
 		EClass ATTRIBUTE_DEFINITION_STRING = eINSTANCE.getAttributeDefinitionString();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Type</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_DEFINITION_STRING__TYPE = eINSTANCE.getAttributeDefinitionString_Type();
 
 		/**
-		 * The meta object literal for the '<em><b>Default Value</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Default Value</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE = eINSTANCE.getAttributeDefinitionString_DefaultValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionStringImpl <em>Datatype Definition String</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionStringImpl
+		 * <em>Datatype Definition String</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.DatatypeDefinitionStringImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDatatypeDefinitionString()
 		 * @generated
@@ -5879,17 +5706,17 @@
 		EClass DATATYPE_DEFINITION_STRING = eINSTANCE.getDatatypeDefinitionString();
 
 		/**
-		 * The meta object literal for the '<em><b>Max Length</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Max Length</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DATATYPE_DEFINITION_STRING__MAX_LENGTH = eINSTANCE.getDatatypeDefinitionString_MaxLength();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueStringImpl <em>Attribute Value String</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.AttributeValueStringImpl
+		 * <em>Attribute Value String</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.AttributeValueStringImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getAttributeValueString()
 		 * @generated
@@ -5897,25 +5724,25 @@
 		EClass ATTRIBUTE_VALUE_STRING = eINSTANCE.getAttributeValueString();
 
 		/**
-		 * The meta object literal for the '<em><b>The Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>The Value</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ATTRIBUTE_VALUE_STRING__THE_VALUE = eINSTANCE.getAttributeValueString_TheValue();
 
 		/**
-		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ATTRIBUTE_VALUE_STRING__DEFINITION = eINSTANCE.getAttributeValueString_Definition();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.XhtmlContentImpl <em>Xhtml Content</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.impl.XhtmlContentImpl <em>Xhtml Content</em>}
+		 * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.rmf.reqif10.impl.XhtmlContentImpl
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getXhtmlContent()
 		 * @generated
@@ -5923,25 +5750,24 @@
 		EClass XHTML_CONTENT = eINSTANCE.getXhtmlContent();
 
 		/**
-		 * The meta object literal for the '<em><b>Xhtml</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Xhtml</b></em>' containment reference feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference XHTML_CONTENT__XHTML = eINSTANCE.getXhtmlContent_Xhtml();
 
 		/**
-		 * The meta object literal for the '<em><b>Xhtml Source</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Xhtml Source</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute XHTML_CONTENT__XHTML_SOURCE = eINSTANCE.getXhtmlContent_XhtmlSource();
 
 		/**
-		 * The meta object literal for the '<em>Date Time</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Date Time</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.util.GregorianCalendar
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getDateTime()
 		 * @generated
@@ -5949,9 +5775,8 @@
 		EDataType DATE_TIME = eINSTANCE.getDateTime();
 
 		/**
-		 * The meta object literal for the '<em>ID</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>ID</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.rmf.reqif10.impl.ReqIF10PackageImpl#getID()
 		 * @generated
@@ -5960,4 +5785,4 @@
 
 	}
 
-} //ReqIF10Package
+} // ReqIF10Package
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIFContent.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIFContent.java
index 417eedf..9665860 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIFContent.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIFContent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,56 +12,52 @@
 package org.eclipse.rmf.reqif10;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Req IF Content</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Req IF Content</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIFContent#getDatatypes <em>Datatypes</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecTypes <em>Spec Types</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecObjects <em>Spec Objects</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelations <em>Spec Relations</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecifications <em>Specifications</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelationGroups <em>Spec Relation Groups</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIFContent#getDatatypes <em>Datatypes</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecTypes <em>Spec Types</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecObjects <em>Spec Objects</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelations <em>Spec Relations</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecifications <em>Specifications</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelationGroups <em>Spec Relation Groups</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFContent()
- * @model extendedMetaData="name='REQ-IF-CONTENT' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='REQ-IF-CONTENT'"
+ * @model extendedMetaData="name='REQ-IF-CONTENT' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='REQ-IF-CONTENT'"
  * @generated
  */
 public interface ReqIFContent extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Datatypes</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.DatatypeDefinition}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Datatypes</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.DatatypeDefinition}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Datatypes</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Datatypes</em>' containment reference list isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Datatypes</em>' containment reference list.
 	 * @see #isSetDatatypes()
 	 * @see #unsetDatatypes()
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFContent_Datatypes()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='DATATYPES' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPES' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='DATATYPES' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='DATATYPES' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	EList<DatatypeDefinition> getDatatypes();
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getDatatypes <em>Datatypes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getDatatypes <em>Datatypes</em>}'
+	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetDatatypes()
 	 * @see #getDatatypes()
 	 * @generated
@@ -69,9 +65,9 @@
 	void unsetDatatypes();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getDatatypes <em>Datatypes</em>}' containment reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getDatatypes <em>Datatypes</em>}'
+	 * containment reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Datatypes</em>' containment reference list is set.
 	 * @see #unsetDatatypes()
 	 * @see #getDatatypes()
@@ -80,29 +76,29 @@
 	boolean isSetDatatypes();
 
 	/**
-	 * Returns the value of the '<em><b>Spec Types</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.SpecType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Spec Types</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.SpecType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Spec Types</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Spec Types</em>' containment reference list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Spec Types</em>' containment reference list.
 	 * @see #isSetSpecTypes()
 	 * @see #unsetSpecTypes()
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFContent_SpecTypes()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='SPEC-TYPES' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-TYPES' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='SPEC-TYPES' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-TYPES' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	EList<SpecType> getSpecTypes();
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecTypes <em>Spec Types</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecTypes <em>Spec Types</em>}'
+	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpecTypes()
 	 * @see #getSpecTypes()
 	 * @generated
@@ -110,9 +106,9 @@
 	void unsetSpecTypes();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecTypes <em>Spec Types</em>}' containment reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecTypes <em>Spec Types</em>}'
+	 * containment reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Spec Types</em>' containment reference list is set.
 	 * @see #unsetSpecTypes()
 	 * @see #getSpecTypes()
@@ -121,29 +117,29 @@
 	boolean isSetSpecTypes();
 
 	/**
-	 * Returns the value of the '<em><b>Spec Objects</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.SpecObject}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Spec Objects</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.SpecObject}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Spec Objects</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Spec Objects</em>' containment reference list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Spec Objects</em>' containment reference list.
 	 * @see #isSetSpecObjects()
 	 * @see #unsetSpecObjects()
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFContent_SpecObjects()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='SPEC-OBJECTS' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-OBJECTS' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='SPEC-OBJECTS' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-OBJECTS' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	EList<SpecObject> getSpecObjects();
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecObjects <em>Spec Objects</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecObjects <em>Spec Objects</em>}'
+	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpecObjects()
 	 * @see #getSpecObjects()
 	 * @generated
@@ -151,9 +147,9 @@
 	void unsetSpecObjects();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecObjects <em>Spec Objects</em>}' containment reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecObjects
+	 * <em>Spec Objects</em>}' containment reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Spec Objects</em>' containment reference list is set.
 	 * @see #unsetSpecObjects()
 	 * @see #getSpecObjects()
@@ -162,29 +158,29 @@
 	boolean isSetSpecObjects();
 
 	/**
-	 * Returns the value of the '<em><b>Spec Relations</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.SpecRelation}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Spec Relations</b></em>' containment reference list. The list contents are of
+	 * type {@link org.eclipse.rmf.reqif10.SpecRelation}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Spec Relations</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Spec Relations</em>' containment reference list isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Spec Relations</em>' containment reference list.
 	 * @see #isSetSpecRelations()
 	 * @see #unsetSpecRelations()
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFContent_SpecRelations()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='SPEC-RELATIONS' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-RELATIONS' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='SPEC-RELATIONS' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-RELATIONS' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	EList<SpecRelation> getSpecRelations();
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelations <em>Spec Relations</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelations <em>Spec Relations</em>}'
+	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpecRelations()
 	 * @see #getSpecRelations()
 	 * @generated
@@ -192,9 +188,9 @@
 	void unsetSpecRelations();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelations <em>Spec Relations</em>}' containment reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelations
+	 * <em>Spec Relations</em>}' containment reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Spec Relations</em>' containment reference list is set.
 	 * @see #unsetSpecRelations()
 	 * @see #getSpecRelations()
@@ -203,29 +199,29 @@
 	boolean isSetSpecRelations();
 
 	/**
-	 * Returns the value of the '<em><b>Specifications</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.Specification}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Specifications</b></em>' containment reference list. The list contents are of
+	 * type {@link org.eclipse.rmf.reqif10.Specification}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Specifications</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Specifications</em>' containment reference list isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Specifications</em>' containment reference list.
 	 * @see #isSetSpecifications()
 	 * @see #unsetSpecifications()
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFContent_Specifications()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='SPECIFICATIONS' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPECIFICATIONS' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='SPECIFICATIONS' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPECIFICATIONS' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	EList<Specification> getSpecifications();
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecifications <em>Specifications</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecifications <em>Specifications</em>}'
+	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpecifications()
 	 * @see #getSpecifications()
 	 * @generated
@@ -233,9 +229,9 @@
 	void unsetSpecifications();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecifications <em>Specifications</em>}' containment reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecifications
+	 * <em>Specifications</em>}' containment reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Specifications</em>' containment reference list is set.
 	 * @see #unsetSpecifications()
 	 * @see #getSpecifications()
@@ -244,29 +240,29 @@
 	boolean isSetSpecifications();
 
 	/**
-	 * Returns the value of the '<em><b>Spec Relation Groups</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.RelationGroup}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Spec Relation Groups</b></em>' containment reference list. The list contents are
+	 * of type {@link org.eclipse.rmf.reqif10.RelationGroup}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Spec Relation Groups</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Spec Relation Groups</em>' containment reference list isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Spec Relation Groups</em>' containment reference list.
 	 * @see #isSetSpecRelationGroups()
 	 * @see #unsetSpecRelationGroups()
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFContent_SpecRelationGroups()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='SPEC-RELATION-GROUPS' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-RELATION-GROUPS' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='SPEC-RELATION-GROUPS' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-RELATION-GROUPS' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	EList<RelationGroup> getSpecRelationGroups();
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelationGroups <em>Spec Relation Groups</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelationGroups
+	 * <em>Spec Relation Groups</em>}' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpecRelationGroups()
 	 * @see #getSpecRelationGroups()
 	 * @generated
@@ -274,9 +270,9 @@
 	void unsetSpecRelationGroups();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelationGroups <em>Spec Relation Groups</em>}' containment reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFContent#getSpecRelationGroups
+	 * <em>Spec Relation Groups</em>}' containment reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Spec Relation Groups</em>' containment reference list is set.
 	 * @see #unsetSpecRelationGroups()
 	 * @see #getSpecRelationGroups()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIFHeader.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIFHeader.java
index da7e774..95d0ebd 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIFHeader.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIFHeader.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,60 +12,57 @@
 package org.eclipse.rmf.reqif10;
 
 import java.util.GregorianCalendar;
-import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Req IF Header</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Req IF Header</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIFHeader#getComment <em>Comment</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIFHeader#getCreationTime <em>Creation Time</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIFHeader#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIFHeader#getRepositoryId <em>Repository Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFToolId <em>Req IF Tool Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFVersion <em>Req IF Version</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIFHeader#getSourceToolId <em>Source Tool Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIFHeader#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIFHeader#getComment <em>Comment</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIFHeader#getCreationTime <em>Creation Time</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIFHeader#getIdentifier <em>Identifier</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIFHeader#getRepositoryId <em>Repository Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFToolId <em>Req IF Tool Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFVersion <em>Req IF Version</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIFHeader#getSourceToolId <em>Source Tool Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIFHeader#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFHeader()
- * @model extendedMetaData="name='REQ-IF-HEADER' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='REQ-IF-HEADER'"
+ * @model extendedMetaData="name='REQ-IF-HEADER' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='REQ-IF-HEADER'"
  * @generated
  */
 public interface ReqIFHeader extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Comment</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Comment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Comment</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Comment</em>' attribute.
 	 * @see #isSetComment()
 	 * @see #unsetComment()
 	 * @see #setComment(String)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFHeader_Comment()
 	 * @model unsettable="true" ordered="false"
-	 *        extendedMetaData="name='COMMENT' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='COMMENT' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 *        extendedMetaData="name='COMMENT' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='COMMENT' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	String getComment();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getComment <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Comment</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getComment <em>Comment</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Comment</em>' attribute.
 	 * @see #isSetComment()
 	 * @see #unsetComment()
 	 * @see #getComment()
@@ -74,9 +71,9 @@
 	void setComment(String value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getComment <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getComment <em>Comment</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetComment()
 	 * @see #getComment()
 	 * @see #setComment(String)
@@ -85,9 +82,9 @@
 	void unsetComment();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getComment <em>Comment</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getComment <em>Comment</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Comment</em>' attribute is set.
 	 * @see #unsetComment()
 	 * @see #getComment()
@@ -97,30 +94,31 @@
 	boolean isSetComment();
 
 	/**
-	 * Returns the value of the '<em><b>Creation Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Creation Time</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Creation Time</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Creation Time</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Creation Time</em>' attribute.
 	 * @see #isSetCreationTime()
 	 * @see #unsetCreationTime()
 	 * @see #setCreationTime(GregorianCalendar)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFHeader_CreationTime()
 	 * @model unsettable="true" dataType="org.eclipse.rmf.reqif10.DateTime" required="true" ordered="false"
-	 *        extendedMetaData="name='CREATION-TIME' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='CREATION-TIME' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 *        extendedMetaData="name='CREATION-TIME' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='CREATION-TIME' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	GregorianCalendar getCreationTime();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getCreationTime <em>Creation Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Time</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getCreationTime <em>Creation Time</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Creation Time</em>' attribute.
 	 * @see #isSetCreationTime()
 	 * @see #unsetCreationTime()
 	 * @see #getCreationTime()
@@ -129,9 +127,9 @@
 	void setCreationTime(GregorianCalendar value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getCreationTime <em>Creation Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getCreationTime <em>Creation Time</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetCreationTime()
 	 * @see #getCreationTime()
 	 * @see #setCreationTime(GregorianCalendar)
@@ -140,9 +138,9 @@
 	void unsetCreationTime();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getCreationTime <em>Creation Time</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getCreationTime
+	 * <em>Creation Time</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Creation Time</em>' attribute is set.
 	 * @see #unsetCreationTime()
 	 * @see #getCreationTime()
@@ -152,30 +150,31 @@
 	boolean isSetCreationTime();
 
 	/**
-	 * Returns the value of the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Identifier</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Identifier</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Identifier</em>' attribute.
 	 * @see #isSetIdentifier()
 	 * @see #unsetIdentifier()
 	 * @see #setIdentifier(String)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFHeader_Identifier()
 	 * @model unsettable="true" id="true" dataType="org.eclipse.rmf.reqif10.ID" required="true" ordered="false"
-	 *        extendedMetaData="name='IDENTIFIER' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='IDENTIFIER' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 *        extendedMetaData="name='IDENTIFIER' kind='attribute'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='IDENTIFIER' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	String getIdentifier();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getIdentifier <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Identifier</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Identifier</em>' attribute.
 	 * @see #isSetIdentifier()
 	 * @see #unsetIdentifier()
 	 * @see #getIdentifier()
@@ -184,9 +183,9 @@
 	void setIdentifier(String value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getIdentifier <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getIdentifier <em>Identifier</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetIdentifier()
 	 * @see #getIdentifier()
 	 * @see #setIdentifier(String)
@@ -195,9 +194,9 @@
 	void unsetIdentifier();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getIdentifier <em>Identifier</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getIdentifier <em>Identifier</em>}'
+	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Identifier</em>' attribute is set.
 	 * @see #unsetIdentifier()
 	 * @see #getIdentifier()
@@ -207,30 +206,31 @@
 	boolean isSetIdentifier();
 
 	/**
-	 * Returns the value of the '<em><b>Repository Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Repository Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Repository Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Repository Id</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Repository Id</em>' attribute.
 	 * @see #isSetRepositoryId()
 	 * @see #unsetRepositoryId()
 	 * @see #setRepositoryId(String)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFHeader_RepositoryId()
 	 * @model unsettable="true" ordered="false"
-	 *        extendedMetaData="name='REPOSITORY-ID' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='REPOSITORY-ID' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 *        extendedMetaData="name='REPOSITORY-ID' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='REPOSITORY-ID' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	String getRepositoryId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getRepositoryId <em>Repository Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Repository Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getRepositoryId <em>Repository Id</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Repository Id</em>' attribute.
 	 * @see #isSetRepositoryId()
 	 * @see #unsetRepositoryId()
 	 * @see #getRepositoryId()
@@ -239,9 +239,9 @@
 	void setRepositoryId(String value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getRepositoryId <em>Repository Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getRepositoryId <em>Repository Id</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetRepositoryId()
 	 * @see #getRepositoryId()
 	 * @see #setRepositoryId(String)
@@ -250,9 +250,9 @@
 	void unsetRepositoryId();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getRepositoryId <em>Repository Id</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getRepositoryId
+	 * <em>Repository Id</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Repository Id</em>' attribute is set.
 	 * @see #unsetRepositoryId()
 	 * @see #getRepositoryId()
@@ -262,30 +262,31 @@
 	boolean isSetRepositoryId();
 
 	/**
-	 * Returns the value of the '<em><b>Req IF Tool Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Req IF Tool Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Req IF Tool Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Req IF Tool Id</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Req IF Tool Id</em>' attribute.
 	 * @see #isSetReqIFToolId()
 	 * @see #unsetReqIFToolId()
 	 * @see #setReqIFToolId(String)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFHeader_ReqIFToolId()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='REQ-IF-TOOL-ID' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='REQ-IF-TOOL-ID' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 *        extendedMetaData="name='REQ-IF-TOOL-ID' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='REQ-IF-TOOL-ID' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	String getReqIFToolId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFToolId <em>Req IF Tool Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Req IF Tool Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFToolId <em>Req IF Tool Id</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Req IF Tool Id</em>' attribute.
 	 * @see #isSetReqIFToolId()
 	 * @see #unsetReqIFToolId()
 	 * @see #getReqIFToolId()
@@ -294,9 +295,9 @@
 	void setReqIFToolId(String value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFToolId <em>Req IF Tool Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFToolId <em>Req IF Tool Id</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetReqIFToolId()
 	 * @see #getReqIFToolId()
 	 * @see #setReqIFToolId(String)
@@ -305,9 +306,9 @@
 	void unsetReqIFToolId();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFToolId <em>Req IF Tool Id</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFToolId
+	 * <em>Req IF Tool Id</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Req IF Tool Id</em>' attribute is set.
 	 * @see #unsetReqIFToolId()
 	 * @see #getReqIFToolId()
@@ -317,30 +318,31 @@
 	boolean isSetReqIFToolId();
 
 	/**
-	 * Returns the value of the '<em><b>Req IF Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Req IF Version</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Req IF Version</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Req IF Version</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Req IF Version</em>' attribute.
 	 * @see #isSetReqIFVersion()
 	 * @see #unsetReqIFVersion()
 	 * @see #setReqIFVersion(String)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFHeader_ReqIFVersion()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='REQ-IF-VERSION' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='REQ-IF-VERSION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 *        extendedMetaData="name='REQ-IF-VERSION' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='REQ-IF-VERSION' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	String getReqIFVersion();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFVersion <em>Req IF Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Req IF Version</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFVersion <em>Req IF Version</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Req IF Version</em>' attribute.
 	 * @see #isSetReqIFVersion()
 	 * @see #unsetReqIFVersion()
 	 * @see #getReqIFVersion()
@@ -349,9 +351,9 @@
 	void setReqIFVersion(String value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFVersion <em>Req IF Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFVersion <em>Req IF Version</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetReqIFVersion()
 	 * @see #getReqIFVersion()
 	 * @see #setReqIFVersion(String)
@@ -360,9 +362,9 @@
 	void unsetReqIFVersion();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFVersion <em>Req IF Version</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getReqIFVersion
+	 * <em>Req IF Version</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Req IF Version</em>' attribute is set.
 	 * @see #unsetReqIFVersion()
 	 * @see #getReqIFVersion()
@@ -372,30 +374,31 @@
 	boolean isSetReqIFVersion();
 
 	/**
-	 * Returns the value of the '<em><b>Source Tool Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Source Tool Id</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Source Tool Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Source Tool Id</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Source Tool Id</em>' attribute.
 	 * @see #isSetSourceToolId()
 	 * @see #unsetSourceToolId()
 	 * @see #setSourceToolId(String)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFHeader_SourceToolId()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='SOURCE-TOOL-ID' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SOURCE-TOOL-ID' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 *        extendedMetaData="name='SOURCE-TOOL-ID' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SOURCE-TOOL-ID' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	String getSourceToolId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getSourceToolId <em>Source Tool Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source Tool Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getSourceToolId <em>Source Tool Id</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Source Tool Id</em>' attribute.
 	 * @see #isSetSourceToolId()
 	 * @see #unsetSourceToolId()
 	 * @see #getSourceToolId()
@@ -404,9 +407,9 @@
 	void setSourceToolId(String value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getSourceToolId <em>Source Tool Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getSourceToolId <em>Source Tool Id</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSourceToolId()
 	 * @see #getSourceToolId()
 	 * @see #setSourceToolId(String)
@@ -415,9 +418,9 @@
 	void unsetSourceToolId();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getSourceToolId <em>Source Tool Id</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getSourceToolId
+	 * <em>Source Tool Id</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Source Tool Id</em>' attribute is set.
 	 * @see #unsetSourceToolId()
 	 * @see #getSourceToolId()
@@ -427,30 +430,31 @@
 	boolean isSetSourceToolId();
 
 	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Title</em>' attribute.
 	 * @see #isSetTitle()
 	 * @see #unsetTitle()
 	 * @see #setTitle(String)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFHeader_Title()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='TITLE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TITLE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 *        extendedMetaData="name='TITLE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TITLE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	String getTitle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
 	 * @see #isSetTitle()
 	 * @see #unsetTitle()
 	 * @see #getTitle()
@@ -459,9 +463,9 @@
 	void setTitle(String value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getTitle <em>Title</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetTitle()
 	 * @see #getTitle()
 	 * @see #setTitle(String)
@@ -470,9 +474,9 @@
 	void unsetTitle();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getTitle <em>Title</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFHeader#getTitle <em>Title</em>}' attribute
+	 * is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Title</em>' attribute is set.
 	 * @see #unsetTitle()
 	 * @see #getTitle()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIFToolExtension.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIFToolExtension.java
index b4f6d2c..0c3d5be 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIFToolExtension.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/ReqIFToolExtension.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,51 +12,49 @@
 package org.eclipse.rmf.reqif10;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Req IF Tool Extension</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Req IF Tool Extension</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.ReqIFToolExtension#getExtensions <em>Extensions</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.ReqIFToolExtension#getExtensions <em>Extensions</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFToolExtension()
- * @model extendedMetaData="name='REQ-IF-TOOL-EXTENSION' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='REQ-IF-TOOL-EXTENSION'"
+ * @model extendedMetaData="name='REQ-IF-TOOL-EXTENSION' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='REQ-IF-TOOL-EXTENSION'"
  * @generated
  */
 public interface ReqIFToolExtension extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Extensions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.EObject}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Extensions</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.emf.ecore.EObject}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Extensions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Extensions</em>' containment reference list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Extensions</em>' containment reference list.
 	 * @see #isSetExtensions()
 	 * @see #unsetExtensions()
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getReqIFToolExtension_Extensions()
-	 * @model containment="true" unsettable="true"
-	 *        extendedMetaData="name='EXTENSIONS' kind='elementWildcard' namespace='##targetNamespace' precessing='lax' wildcards='##other'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='EXTENSIONS' featureWrapperElement='false' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
+	 * @model containment="true" unsettable="true" extendedMetaData=
+	 *        "name='EXTENSIONS' kind='elementWildcard' namespace='##targetNamespace' precessing='lax' wildcards='##other'"
+	 *        annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='EXTENSIONS' featureWrapperElement='false' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	EList<EObject> getExtensions();
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFToolExtension#getExtensions <em>Extensions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.ReqIFToolExtension#getExtensions <em>Extensions</em>}'
+	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetExtensions()
 	 * @see #getExtensions()
 	 * @generated
@@ -64,9 +62,9 @@
 	void unsetExtensions();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFToolExtension#getExtensions <em>Extensions</em>}' containment reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.ReqIFToolExtension#getExtensions
+	 * <em>Extensions</em>}' containment reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Extensions</em>' containment reference list is set.
 	 * @see #unsetExtensions()
 	 * @see #getExtensions()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecElementWithAttributes.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecElementWithAttributes.java
index d1d8be9..5f04f64 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecElementWithAttributes.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecElementWithAttributes.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,48 +14,45 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Spec Element With Attributes</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Spec Element With Attributes</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.SpecElementWithAttributes#getValues <em>Values</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.SpecElementWithAttributes#getValues <em>Values</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecElementWithAttributes()
- * @model abstract="true"
- *        extendedMetaData="name='SPEC-ELEMENT-WITH-ATTRIBUTES' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-ELEMENT-WITH-ATTRIBUTES'"
+ * @model abstract="true" extendedMetaData="name='SPEC-ELEMENT-WITH-ATTRIBUTES' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-ELEMENT-WITH-ATTRIBUTES'"
  * @generated
  */
 public interface SpecElementWithAttributes extends Identifiable {
 	/**
-	 * Returns the value of the '<em><b>Values</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.AttributeValue}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Values</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.AttributeValue}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Values</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Values</em>' containment reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Values</em>' containment reference list.
 	 * @see #isSetValues()
 	 * @see #unsetValues()
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecElementWithAttributes_Values()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='VALUES' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='VALUES' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='VALUES' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='VALUES' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	EList<AttributeValue> getValues();
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecElementWithAttributes#getValues <em>Values</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecElementWithAttributes#getValues <em>Values</em>}'
+	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetValues()
 	 * @see #getValues()
 	 * @generated
@@ -63,9 +60,9 @@
 	void unsetValues();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecElementWithAttributes#getValues <em>Values</em>}' containment reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecElementWithAttributes#getValues
+	 * <em>Values</em>}' containment reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Values</em>' containment reference list is set.
 	 * @see #unsetValues()
 	 * @see #getValues()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecHierarchy.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecHierarchy.java
index 7986e0e..1a94947 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecHierarchy.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecHierarchy.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,51 +14,48 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Spec Hierarchy</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Spec Hierarchy</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.SpecHierarchy#isTableInternal <em>Table Internal</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.SpecHierarchy#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.SpecHierarchy#getChildren <em>Children</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.SpecHierarchy#getEditableAtts <em>Editable Atts</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.SpecHierarchy#isTableInternal <em>Table Internal</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.SpecHierarchy#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.SpecHierarchy#getChildren <em>Children</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.SpecHierarchy#getEditableAtts <em>Editable Atts</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecHierarchy()
- * @model extendedMetaData="name='SPEC-HIERARCHY' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-HIERARCHY'"
+ * @model extendedMetaData="name='SPEC-HIERARCHY' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-HIERARCHY'"
  * @generated
  */
 public interface SpecHierarchy extends AccessControlledElement {
 	/**
-	 * Returns the value of the '<em><b>Table Internal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Table Internal</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Table Internal</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Table Internal</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Table Internal</em>' attribute.
 	 * @see #isSetTableInternal()
 	 * @see #unsetTableInternal()
 	 * @see #setTableInternal(boolean)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecHierarchy_TableInternal()
-	 * @model unsettable="true" ordered="false"
-	 *        extendedMetaData="name='IS-TABLE-INTERNAL' kind='attribute'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='IS-TABLE-INTERNAL' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 * @model unsettable="true" ordered="false" extendedMetaData="name='IS-TABLE-INTERNAL' kind='attribute'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='IS-TABLE-INTERNAL' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	boolean isTableInternal();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#isTableInternal <em>Table Internal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table Internal</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#isTableInternal <em>Table Internal</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Table Internal</em>' attribute.
 	 * @see #isSetTableInternal()
 	 * @see #unsetTableInternal()
 	 * @see #isTableInternal()
@@ -67,9 +64,9 @@
 	void setTableInternal(boolean value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#isTableInternal <em>Table Internal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#isTableInternal <em>Table Internal</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetTableInternal()
 	 * @see #isTableInternal()
 	 * @see #setTableInternal(boolean)
@@ -78,9 +75,9 @@
 	void unsetTableInternal();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#isTableInternal <em>Table Internal</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#isTableInternal
+	 * <em>Table Internal</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Table Internal</em>' attribute is set.
 	 * @see #unsetTableInternal()
 	 * @see #isTableInternal()
@@ -90,30 +87,31 @@
 	boolean isSetTableInternal();
 
 	/**
-	 * Returns the value of the '<em><b>Object</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Object</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Object</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Object</em>' reference isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Object</em>' reference.
 	 * @see #isSetObject()
 	 * @see #unsetObject()
 	 * @see #setObject(SpecObject)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecHierarchy_Object()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='OBJECT' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='OBJECT' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='OBJECT' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='OBJECT' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	SpecObject getObject();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getObject <em>Object</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Object</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getObject <em>Object</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Object</em>' reference.
 	 * @see #isSetObject()
 	 * @see #unsetObject()
 	 * @see #getObject()
@@ -122,9 +120,9 @@
 	void setObject(SpecObject value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getObject <em>Object</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getObject <em>Object</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetObject()
 	 * @see #getObject()
 	 * @see #setObject(SpecObject)
@@ -133,9 +131,9 @@
 	void unsetObject();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getObject <em>Object</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getObject <em>Object</em>}'
+	 * reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Object</em>' reference is set.
 	 * @see #unsetObject()
 	 * @see #getObject()
@@ -145,29 +143,29 @@
 	boolean isSetObject();
 
 	/**
-	 * Returns the value of the '<em><b>Children</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.SpecHierarchy}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Children</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.SpecHierarchy}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Children</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Children</em>' containment reference list isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Children</em>' containment reference list.
 	 * @see #isSetChildren()
 	 * @see #unsetChildren()
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecHierarchy_Children()
 	 * @model containment="true" unsettable="true"
-	 *        extendedMetaData="name='CHILDREN' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='CHILDREN' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='CHILDREN' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='CHILDREN' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	EList<SpecHierarchy> getChildren();
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getChildren <em>Children</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getChildren <em>Children</em>}' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetChildren()
 	 * @see #getChildren()
 	 * @generated
@@ -175,9 +173,9 @@
 	void unsetChildren();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getChildren <em>Children</em>}' containment reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getChildren <em>Children</em>}'
+	 * containment reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Children</em>' containment reference list is set.
 	 * @see #unsetChildren()
 	 * @see #getChildren()
@@ -186,29 +184,29 @@
 	boolean isSetChildren();
 
 	/**
-	 * Returns the value of the '<em><b>Editable Atts</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.AttributeDefinition}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Editable Atts</b></em>' reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.AttributeDefinition}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Editable Atts</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Editable Atts</em>' reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Editable Atts</em>' reference list.
 	 * @see #isSetEditableAtts()
 	 * @see #unsetEditableAtts()
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecHierarchy_EditableAtts()
 	 * @model unsettable="true" ordered="false"
-	 *        extendedMetaData="name='EDITABLE-ATTS' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='EDITABLE-ATTS' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='EDITABLE-ATTS' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='EDITABLE-ATTS' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	EList<AttributeDefinition> getEditableAtts();
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getEditableAtts <em>Editable Atts</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getEditableAtts <em>Editable Atts</em>}'
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetEditableAtts()
 	 * @see #getEditableAtts()
 	 * @generated
@@ -216,9 +214,9 @@
 	void unsetEditableAtts();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getEditableAtts <em>Editable Atts</em>}' reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecHierarchy#getEditableAtts
+	 * <em>Editable Atts</em>}' reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Editable Atts</em>' reference list is set.
 	 * @see #unsetEditableAtts()
 	 * @see #getEditableAtts()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecObject.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecObject.java
index 94e6d09..f0bcb30 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecObject.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecObject.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,50 +11,46 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Spec Object</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Spec Object</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.SpecObject#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.SpecObject#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecObject()
- * @model extendedMetaData="name='SPEC-OBJECT' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-OBJECT'"
+ * @model extendedMetaData="name='SPEC-OBJECT' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-OBJECT'"
  * @generated
  */
 public interface SpecObject extends SpecElementWithAttributes {
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #setType(SpecObjectType)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecObject_Type()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	SpecObjectType getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.SpecObject#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.SpecObject#getType <em>Type</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #getType()
@@ -63,9 +59,9 @@
 	void setType(SpecObjectType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecObject#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecObject#getType <em>Type</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetType()
 	 * @see #getType()
 	 * @see #setType(SpecObjectType)
@@ -74,9 +70,9 @@
 	void unsetType();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecObject#getType <em>Type</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecObject#getType <em>Type</em>}' reference is
+	 * set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Type</em>' reference is set.
 	 * @see #unsetType()
 	 * @see #getType()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecObjectType.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecObjectType.java
index 4205342..9f4c864 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecObjectType.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecObjectType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,16 +11,13 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Spec Object Type</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Spec Object Type</b></em>'. <!-- end-user-doc
+ * -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecObjectType()
- * @model extendedMetaData="name='SPEC-OBJECT-TYPE' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-OBJECT-TYPE'"
+ * @model extendedMetaData="name='SPEC-OBJECT-TYPE' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-OBJECT-TYPE'"
  * @generated
  */
 public interface SpecObjectType extends SpecType {
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecRelation.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecRelation.java
index 812a1c5..52ea361 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecRelation.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecRelation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,52 +11,49 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Spec Relation</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Spec Relation</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.SpecRelation#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.SpecRelation#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.SpecRelation#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.SpecRelation#getTarget <em>Target</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.SpecRelation#getSource <em>Source</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.SpecRelation#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecRelation()
- * @model extendedMetaData="name='SPEC-RELATION' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-RELATION'"
+ * @model extendedMetaData="name='SPEC-RELATION' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-RELATION'"
  * @generated
  */
 public interface SpecRelation extends SpecElementWithAttributes {
 	/**
-	 * Returns the value of the '<em><b>Target</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Target</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Target</em>' reference isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target</em>' reference.
 	 * @see #isSetTarget()
 	 * @see #unsetTarget()
 	 * @see #setTarget(SpecObject)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecRelation_Target()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='TARGET' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TARGET' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='TARGET' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TARGET' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	SpecObject getTarget();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getTarget <em>Target</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getTarget <em>Target</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Target</em>' reference.
 	 * @see #isSetTarget()
 	 * @see #unsetTarget()
 	 * @see #getTarget()
@@ -65,9 +62,9 @@
 	void setTarget(SpecObject value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getTarget <em>Target</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getTarget <em>Target</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetTarget()
 	 * @see #getTarget()
 	 * @see #setTarget(SpecObject)
@@ -76,9 +73,9 @@
 	void unsetTarget();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getTarget <em>Target</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getTarget <em>Target</em>}'
+	 * reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Target</em>' reference is set.
 	 * @see #unsetTarget()
 	 * @see #getTarget()
@@ -88,30 +85,31 @@
 	boolean isSetTarget();
 
 	/**
-	 * Returns the value of the '<em><b>Source</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Source</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Source</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Source</em>' reference isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Source</em>' reference.
 	 * @see #isSetSource()
 	 * @see #unsetSource()
 	 * @see #setSource(SpecObject)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecRelation_Source()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='SOURCE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SOURCE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='SOURCE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SOURCE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	SpecObject getSource();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getSource <em>Source</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getSource <em>Source</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Source</em>' reference.
 	 * @see #isSetSource()
 	 * @see #unsetSource()
 	 * @see #getSource()
@@ -120,9 +118,9 @@
 	void setSource(SpecObject value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getSource <em>Source</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getSource <em>Source</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSource()
 	 * @see #getSource()
 	 * @see #setSource(SpecObject)
@@ -131,9 +129,9 @@
 	void unsetSource();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getSource <em>Source</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getSource <em>Source</em>}'
+	 * reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Source</em>' reference is set.
 	 * @see #unsetSource()
 	 * @see #getSource()
@@ -143,30 +141,30 @@
 	boolean isSetSource();
 
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #setType(SpecRelationType)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecRelation_Type()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	SpecRelationType getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getType <em>Type</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #getType()
@@ -175,9 +173,9 @@
 	void setType(SpecRelationType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getType <em>Type</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetType()
 	 * @see #getType()
 	 * @see #setType(SpecRelationType)
@@ -186,9 +184,9 @@
 	void unsetType();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getType <em>Type</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecRelation#getType <em>Type</em>}' reference
+	 * is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Type</em>' reference is set.
 	 * @see #unsetType()
 	 * @see #getType()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecRelationType.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecRelationType.java
index 4f40109..9bcb707 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecRelationType.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecRelationType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,16 +11,13 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Spec Relation Type</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Spec Relation Type</b></em>'. <!-- end-user-doc
+ * -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecRelationType()
- * @model extendedMetaData="name='SPEC-RELATION-TYPE' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-RELATION-TYPE'"
+ * @model extendedMetaData="name='SPEC-RELATION-TYPE' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-RELATION-TYPE'"
  * @generated
  */
 public interface SpecRelationType extends SpecType {
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecType.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecType.java
index 1edf404..39de4f3 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecType.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,48 +14,44 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Spec Type</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Spec Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.SpecType#getSpecAttributes <em>Spec Attributes</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.SpecType#getSpecAttributes <em>Spec Attributes</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecType()
- * @model abstract="true"
- *        extendedMetaData="name='SPEC-TYPE' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-TYPE'"
+ * @model abstract="true" extendedMetaData="name='SPEC-TYPE' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-TYPE'"
  * @generated
  */
 public interface SpecType extends Identifiable {
 	/**
-	 * Returns the value of the '<em><b>Spec Attributes</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.AttributeDefinition}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Spec Attributes</b></em>' containment reference list. The list contents are of
+	 * type {@link org.eclipse.rmf.reqif10.AttributeDefinition}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Spec Attributes</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Spec Attributes</em>' containment reference list isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Spec Attributes</em>' containment reference list.
 	 * @see #isSetSpecAttributes()
 	 * @see #unsetSpecAttributes()
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecType_SpecAttributes()
 	 * @model containment="true" unsettable="true" ordered="false"
-	 *        extendedMetaData="name='SPEC-ATTRIBUTES' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-ATTRIBUTES' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='SPEC-ATTRIBUTES' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPEC-ATTRIBUTES' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	EList<AttributeDefinition> getSpecAttributes();
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecType#getSpecAttributes <em>Spec Attributes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.SpecType#getSpecAttributes <em>Spec Attributes</em>}'
+	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetSpecAttributes()
 	 * @see #getSpecAttributes()
 	 * @generated
@@ -63,9 +59,9 @@
 	void unsetSpecAttributes();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecType#getSpecAttributes <em>Spec Attributes</em>}' containment reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.SpecType#getSpecAttributes
+	 * <em>Spec Attributes</em>}' containment reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Spec Attributes</em>' containment reference list is set.
 	 * @see #unsetSpecAttributes()
 	 * @see #getSpecAttributes()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/Specification.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/Specification.java
index ee514d9..f8be687 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/Specification.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/Specification.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,49 +14,46 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Specification</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Specification</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.Specification#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.Specification#getChildren <em>Children</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.Specification#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.Specification#getChildren <em>Children</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecification()
- * @model extendedMetaData="name='SPECIFICATION' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPECIFICATION'"
+ * @model extendedMetaData="name='SPECIFICATION' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPECIFICATION'"
  * @generated
  */
 public interface Specification extends SpecElementWithAttributes {
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #setType(SpecificationType)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecification_Type()
 	 * @model unsettable="true" required="true" ordered="false"
-	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
+	 *        extendedMetaData="name='TYPE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='TYPE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='true' classifierNameSuffix='-REF'"
 	 * @generated
 	 */
 	SpecificationType getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.Specification#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.Specification#getType <em>Type</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Type</em>' reference.
 	 * @see #isSetType()
 	 * @see #unsetType()
 	 * @see #getType()
@@ -65,9 +62,9 @@
 	void setType(SpecificationType value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.Specification#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.Specification#getType <em>Type</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetType()
 	 * @see #getType()
 	 * @see #setType(SpecificationType)
@@ -76,9 +73,9 @@
 	void unsetType();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.Specification#getType <em>Type</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.Specification#getType <em>Type</em>}' reference
+	 * is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Type</em>' reference is set.
 	 * @see #unsetType()
 	 * @see #getType()
@@ -88,29 +85,29 @@
 	boolean isSetType();
 
 	/**
-	 * Returns the value of the '<em><b>Children</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rmf.reqif10.SpecHierarchy}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Children</b></em>' containment reference list. The list contents are of type
+	 * {@link org.eclipse.rmf.reqif10.SpecHierarchy}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Children</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Children</em>' containment reference list isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Children</em>' containment reference list.
 	 * @see #isSetChildren()
 	 * @see #unsetChildren()
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecification_Children()
 	 * @model containment="true" unsettable="true"
-	 *        extendedMetaData="name='CHILDREN' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='CHILDREN' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
+	 *        extendedMetaData="name='CHILDREN' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='CHILDREN' featureWrapperElement='true' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	EList<SpecHierarchy> getChildren();
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.Specification#getChildren <em>Children</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.Specification#getChildren <em>Children</em>}' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetChildren()
 	 * @see #getChildren()
 	 * @generated
@@ -118,9 +115,9 @@
 	void unsetChildren();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.Specification#getChildren <em>Children</em>}' containment reference list is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.Specification#getChildren <em>Children</em>}'
+	 * containment reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Children</em>' containment reference list is set.
 	 * @see #unsetChildren()
 	 * @see #getChildren()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecificationType.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecificationType.java
index f6164de..b63f668 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecificationType.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/SpecificationType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,16 +11,13 @@
  */
 package org.eclipse.rmf.reqif10;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Specification Type</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Specification Type</b></em>'. <!-- end-user-doc
+ * -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getSpecificationType()
- * @model extendedMetaData="name='SPECIFICATION-TYPE' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPECIFICATION-TYPE'"
+ * @model extendedMetaData="name='SPECIFICATION-TYPE' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='SPECIFICATION-TYPE'"
  * @generated
  */
 public interface SpecificationType extends SpecType {
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/XhtmlContent.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/XhtmlContent.java
index 457b030..1fb1821 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/XhtmlContent.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/XhtmlContent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,49 +14,48 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xhtml Content</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Xhtml Content</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtml <em>Xhtml</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtmlSource <em>Xhtml Source</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtml <em>Xhtml</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtmlSource <em>Xhtml Source</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package#getXhtmlContent()
- * @model extendedMetaData="name='XHTML-CONTENT' kind='elementOnly'"
- *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='XHTML-CONTENT'"
+ * @model extendedMetaData="name='XHTML-CONTENT' kind='elementOnly'" annotation=
+ *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='XHTML-CONTENT'"
  * @generated
  */
 public interface XhtmlContent extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Xhtml</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml</em>' containment reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml</em>' containment reference.
 	 * @see #isSetXhtml()
 	 * @see #unsetXhtml()
 	 * @see #setXhtml(EObject)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getXhtmlContent_Xhtml()
-	 * @model containment="true" unsettable="true"
-	 *        extendedMetaData="name='XHTML' kind='elementWildcard' namespace='##targetNamespace' precessing='lax' wildcards='http://www.w3.org/1999/xhtml'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='XHTML' featureWrapperElement='false' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
+	 * @model containment="true" unsettable="true" extendedMetaData=
+	 *        "name='XHTML' kind='elementWildcard' namespace='##targetNamespace' precessing='lax' wildcards='http://www.w3.org/1999/xhtml'"
+	 *        annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='XHTML' featureWrapperElement='false' featureElement='false' classifierWrapperElement='false' classifierElement='true'"
 	 * @generated
 	 */
 	EObject getXhtml();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtml <em>Xhtml</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Xhtml</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtml <em>Xhtml</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Xhtml</em>' containment reference.
 	 * @see #isSetXhtml()
 	 * @see #unsetXhtml()
 	 * @see #getXhtml()
@@ -65,9 +64,9 @@
 	void setXhtml(EObject value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtml <em>Xhtml</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtml <em>Xhtml</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetXhtml()
 	 * @see #getXhtml()
 	 * @see #setXhtml(EObject)
@@ -76,9 +75,9 @@
 	void unsetXhtml();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtml <em>Xhtml</em>}' containment reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtml <em>Xhtml</em>}'
+	 * containment reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Xhtml</em>' containment reference is set.
 	 * @see #unsetXhtml()
 	 * @see #getXhtml()
@@ -88,30 +87,31 @@
 	boolean isSetXhtml();
 
 	/**
-	 * Returns the value of the '<em><b>Xhtml Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Xhtml Source</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Xhtml Source</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Xhtml Source</em>' attribute isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Xhtml Source</em>' attribute.
 	 * @see #isSetXhtmlSource()
 	 * @see #unsetXhtmlSource()
 	 * @see #setXhtmlSource(String)
 	 * @see org.eclipse.rmf.reqif10.ReqIF10Package#getXhtmlContent_XhtmlSource()
 	 * @model unsettable="true" transient="true" derived="true"
-	 *        extendedMetaData="name='XHTML-SOURCE' kind='element' namespace='##targetNamespace'"
-	 *        annotation="http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='XHTML-SOURCE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
+	 *        extendedMetaData="name='XHTML-SOURCE' kind='element' namespace='##targetNamespace'" annotation=
+	 *        "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData wrapperName='XHTML-SOURCE' featureWrapperElement='false' featureElement='true' classifierWrapperElement='false' classifierElement='false'"
 	 * @generated
 	 */
 	String getXhtmlSource();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtmlSource <em>Xhtml Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Xhtml Source</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtmlSource <em>Xhtml Source</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Xhtml Source</em>' attribute.
 	 * @see #isSetXhtmlSource()
 	 * @see #unsetXhtmlSource()
 	 * @see #getXhtmlSource()
@@ -120,9 +120,9 @@
 	void setXhtmlSource(String value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtmlSource <em>Xhtml Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtmlSource <em>Xhtml Source</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetXhtmlSource()
 	 * @see #getXhtmlSource()
 	 * @see #setXhtmlSource(String)
@@ -131,9 +131,9 @@
 	void unsetXhtmlSource();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtmlSource <em>Xhtml Source</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.rmf.reqif10.XhtmlContent#getXhtmlSource
+	 * <em>Xhtml Source</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Xhtml Source</em>' attribute is set.
 	 * @see #unsetXhtmlSource()
 	 * @see #getXhtmlSource()
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AccessControlledElementImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AccessControlledElementImpl.java
index 3095737..a7e5449 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AccessControlledElementImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AccessControlledElementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,32 +12,28 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.AccessControlledElement;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Access Controlled Element</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Access Controlled Element</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AccessControlledElementImpl#isEditable <em>Editable</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AccessControlledElementImpl#isEditable <em>Editable</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class AccessControlledElementImpl extends IdentifiableImpl implements AccessControlledElement {
 	/**
-	 * The default value of the '{@link #isEditable() <em>Editable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isEditable() <em>Editable</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isEditable()
 	 * @generated
 	 * @ordered
@@ -45,9 +41,9 @@
 	protected static final boolean EDITABLE_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isEditable() <em>Editable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isEditable() <em>Editable</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isEditable()
 	 * @generated
 	 * @ordered
@@ -55,17 +51,16 @@
 	protected boolean editable = EDITABLE_EDEFAULT;
 
 	/**
-	 * This is true if the Editable attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Editable attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean editableESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AccessControlledElementImpl() {
@@ -73,8 +68,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -83,8 +78,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isEditable() {
@@ -92,8 +87,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setEditable(boolean newEditable) {
@@ -102,12 +97,13 @@
 		boolean oldEditableESet = editableESet;
 		editableESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ACCESS_CONTROLLED_ELEMENT__EDITABLE, oldEditable, editable, !oldEditableESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ACCESS_CONTROLLED_ELEMENT__EDITABLE, oldEditable, editable,
+					!oldEditableESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetEditable() {
@@ -116,12 +112,13 @@
 		editable = EDITABLE_EDEFAULT;
 		editableESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ACCESS_CONTROLLED_ELEMENT__EDITABLE, oldEditable, EDITABLE_EDEFAULT, oldEditableESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ACCESS_CONTROLLED_ELEMENT__EDITABLE, oldEditable,
+					EDITABLE_EDEFAULT, oldEditableESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetEditable() {
@@ -129,77 +126,81 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ACCESS_CONTROLLED_ELEMENT__EDITABLE:
-				return isEditable();
+		case ReqIF10Package.ACCESS_CONTROLLED_ELEMENT__EDITABLE:
+			return isEditable();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ACCESS_CONTROLLED_ELEMENT__EDITABLE:
-				setEditable((Boolean)newValue);
-				return;
+		case ReqIF10Package.ACCESS_CONTROLLED_ELEMENT__EDITABLE:
+			setEditable((Boolean) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ACCESS_CONTROLLED_ELEMENT__EDITABLE:
-				unsetEditable();
-				return;
+		case ReqIF10Package.ACCESS_CONTROLLED_ELEMENT__EDITABLE:
+			unsetEditable();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ACCESS_CONTROLLED_ELEMENT__EDITABLE:
-				return isSetEditable();
+		case ReqIF10Package.ACCESS_CONTROLLED_ELEMENT__EDITABLE:
+			return isSetEditable();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (editable: ");
-		if (editableESet) result.append(editable); else result.append("<unset>");
+		result.append(" (editable: "); //$NON-NLS-1$
+		if (editableESet)
+			result.append(editable);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-} //AccessControlledElementImpl
+} // AccessControlledElementImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AlternativeIDImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AlternativeIDImpl.java
index c9bc646..1b26216 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AlternativeIDImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AlternativeIDImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,33 +12,28 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.rmf.reqif10.AlternativeID;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Alternative ID</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Alternative ID</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AlternativeIDImpl#getIdentifier <em>Identifier</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AlternativeIDImpl#getIdentifier <em>Identifier</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class AlternativeIDImpl extends EObjectImpl implements AlternativeID {
+public class AlternativeIDImpl extends MinimalEObjectImpl implements AlternativeID {
 	/**
-	 * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getIdentifier()
 	 * @generated
 	 * @ordered
@@ -46,9 +41,9 @@
 	protected static final String IDENTIFIER_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getIdentifier()
 	 * @generated
 	 * @ordered
@@ -56,17 +51,16 @@
 	protected String identifier = IDENTIFIER_EDEFAULT;
 
 	/**
-	 * This is true if the Identifier attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Identifier attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean identifierESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AlternativeIDImpl() {
@@ -74,8 +68,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -84,8 +78,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getIdentifier() {
@@ -93,8 +87,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIdentifier(String newIdentifier) {
@@ -102,13 +96,15 @@
 		identifier = newIdentifier;
 		boolean oldIdentifierESet = identifierESet;
 		identifierESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ALTERNATIVE_ID__IDENTIFIER, oldIdentifier, identifier, !oldIdentifierESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ALTERNATIVE_ID__IDENTIFIER, oldIdentifier, identifier,
+					!oldIdentifierESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetIdentifier() {
@@ -116,13 +112,15 @@
 		boolean oldIdentifierESet = identifierESet;
 		identifier = IDENTIFIER_EDEFAULT;
 		identifierESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ALTERNATIVE_ID__IDENTIFIER, oldIdentifier, IDENTIFIER_EDEFAULT, oldIdentifierESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ALTERNATIVE_ID__IDENTIFIER, oldIdentifier, IDENTIFIER_EDEFAULT,
+					oldIdentifierESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetIdentifier() {
@@ -130,77 +128,83 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ALTERNATIVE_ID__IDENTIFIER:
-				return getIdentifier();
+		case ReqIF10Package.ALTERNATIVE_ID__IDENTIFIER:
+			return getIdentifier();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ALTERNATIVE_ID__IDENTIFIER:
-				setIdentifier((String)newValue);
-				return;
+		case ReqIF10Package.ALTERNATIVE_ID__IDENTIFIER:
+			setIdentifier((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ALTERNATIVE_ID__IDENTIFIER:
-				unsetIdentifier();
-				return;
+		case ReqIF10Package.ALTERNATIVE_ID__IDENTIFIER:
+			unsetIdentifier();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ALTERNATIVE_ID__IDENTIFIER:
-				return isSetIdentifier();
+		case ReqIF10Package.ALTERNATIVE_ID__IDENTIFIER:
+			return isSetIdentifier();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy()) {
+			return super.toString();
+		}
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (identifier: ");
-		if (identifierESet) result.append(identifier); else result.append("<unset>");
+		result.append(" (identifier: "); //$NON-NLS-1$
+		if (identifierESet) {
+			result.append(identifier);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
 		result.append(')');
 		return result.toString();
 	}
 
-} //AlternativeIDImpl
+} // AlternativeIDImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionBooleanImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionBooleanImpl.java
index 8b60bfe..39fb9cf 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionBooleanImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionBooleanImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,36 +13,32 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.AttributeDefinitionBoolean;
 import org.eclipse.rmf.reqif10.AttributeValueBoolean;
 import org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Definition Boolean</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Definition Boolean</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionBooleanImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionBooleanImpl#getDefaultValue <em>Default Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionBooleanImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionBooleanImpl#getDefaultValue <em>Default Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AttributeDefinitionBooleanImpl extends AttributeDefinitionSimpleImpl implements AttributeDefinitionBoolean {
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -50,18 +46,17 @@
 	protected DatatypeDefinitionBoolean type;
 
 	/**
-	 * This is true if the Type reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Type reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean typeESet;
 
 	/**
-	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDefaultValue()
 	 * @generated
 	 * @ordered
@@ -69,17 +64,17 @@
 	protected AttributeValueBoolean defaultValue;
 
 	/**
-	 * This is true if the Default Value containment reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Default Value containment reference has been set. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean defaultValueESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeDefinitionBooleanImpl() {
@@ -87,8 +82,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,14 +92,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionBoolean getType() {
 		if (type != null && type.eIsProxy()) {
-			InternalEObject oldType = (InternalEObject)type;
-			type = (DatatypeDefinitionBoolean)eResolveProxy(oldType);
+			InternalEObject oldType = (InternalEObject) type;
+			type = (DatatypeDefinitionBoolean) eResolveProxy(oldType);
 			if (type != oldType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__TYPE, oldType, type));
@@ -114,8 +109,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionBoolean basicGetType() {
@@ -123,8 +118,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(DatatypeDefinitionBoolean newType) {
@@ -137,8 +132,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetType() {
@@ -151,8 +146,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetType() {
@@ -160,8 +155,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeValueBoolean getDefaultValue() {
@@ -169,8 +164,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDefaultValue(AttributeValueBoolean newDefaultValue, NotificationChain msgs) {
@@ -179,38 +174,45 @@
 		boolean oldDefaultValueESet = defaultValueESet;
 		defaultValueESet = true;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE, oldDefaultValue, newDefaultValue, !oldDefaultValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE, oldDefaultValue, newDefaultValue, !oldDefaultValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefaultValue(AttributeValueBoolean newDefaultValue) {
 		if (newDefaultValue != defaultValue) {
 			NotificationChain msgs = null;
 			if (defaultValue != null)
-				msgs = ((InternalEObject)defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE, null, msgs);
+				msgs = ((InternalEObject) defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE, null, msgs);
 			if (newDefaultValue != null)
-				msgs = ((InternalEObject)newDefaultValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE, null, msgs);
+				msgs = ((InternalEObject) newDefaultValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE, null, msgs);
 			msgs = basicSetDefaultValue(newDefaultValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldDefaultValueESet = defaultValueESet;
 			defaultValueESet = true;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE, newDefaultValue, newDefaultValue, !oldDefaultValueESet));
+				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE, newDefaultValue,
+						newDefaultValue, !oldDefaultValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetDefaultValue(NotificationChain msgs) {
@@ -219,35 +221,41 @@
 		boolean oldDefaultValueESet = defaultValueESet;
 		defaultValueESet = false;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE, oldDefaultValue, null, oldDefaultValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET,
+					ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE, oldDefaultValue, null, oldDefaultValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDefaultValue() {
 		if (defaultValue != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject)defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE, null, msgs);
+			msgs = ((InternalEObject) defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+					- ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE, null, msgs);
 			msgs = basicUnsetDefaultValue(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldDefaultValueESet = defaultValueESet;
 			defaultValueESet = false;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE, null, null, oldDefaultValueESet));
+				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE, null, null,
+						oldDefaultValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDefaultValue() {
@@ -255,86 +263,87 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE:
-				return basicUnsetDefaultValue(msgs);
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE:
+			return basicUnsetDefaultValue(msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE:
-				return getDefaultValue();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__TYPE:
+			if (resolve)
+				return getType();
+			return basicGetType();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE:
+			return getDefaultValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__TYPE:
-				setType((DatatypeDefinitionBoolean)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE:
-				setDefaultValue((AttributeValueBoolean)newValue);
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__TYPE:
+			setType((DatatypeDefinitionBoolean) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE:
+			setDefaultValue((AttributeValueBoolean) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__TYPE:
-				unsetType();
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE:
-				unsetDefaultValue();
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__TYPE:
+			unsetType();
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE:
+			unsetDefaultValue();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__TYPE:
-				return isSetType();
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE:
-				return isSetDefaultValue();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__TYPE:
+			return isSetType();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN__DEFAULT_VALUE:
+			return isSetDefaultValue();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //AttributeDefinitionBooleanImpl
+} // AttributeDefinitionBooleanImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionDateImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionDateImpl.java
index 7a2b501..3aab07e 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionDateImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionDateImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,36 +13,32 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.AttributeDefinitionDate;
 import org.eclipse.rmf.reqif10.AttributeValueDate;
 import org.eclipse.rmf.reqif10.DatatypeDefinitionDate;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Definition Date</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Definition Date</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionDateImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionDateImpl#getDefaultValue <em>Default Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionDateImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionDateImpl#getDefaultValue <em>Default Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AttributeDefinitionDateImpl extends AttributeDefinitionSimpleImpl implements AttributeDefinitionDate {
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -50,18 +46,17 @@
 	protected DatatypeDefinitionDate type;
 
 	/**
-	 * This is true if the Type reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Type reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean typeESet;
 
 	/**
-	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDefaultValue()
 	 * @generated
 	 * @ordered
@@ -69,17 +64,17 @@
 	protected AttributeValueDate defaultValue;
 
 	/**
-	 * This is true if the Default Value containment reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Default Value containment reference has been set. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean defaultValueESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeDefinitionDateImpl() {
@@ -87,8 +82,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,14 +92,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionDate getType() {
 		if (type != null && type.eIsProxy()) {
-			InternalEObject oldType = (InternalEObject)type;
-			type = (DatatypeDefinitionDate)eResolveProxy(oldType);
+			InternalEObject oldType = (InternalEObject) type;
+			type = (DatatypeDefinitionDate) eResolveProxy(oldType);
 			if (type != oldType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__TYPE, oldType, type));
@@ -114,8 +109,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionDate basicGetType() {
@@ -123,8 +118,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(DatatypeDefinitionDate newType) {
@@ -137,8 +132,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetType() {
@@ -151,8 +146,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetType() {
@@ -160,8 +155,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeValueDate getDefaultValue() {
@@ -169,8 +164,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDefaultValue(AttributeValueDate newDefaultValue, NotificationChain msgs) {
@@ -179,38 +174,45 @@
 		boolean oldDefaultValueESet = defaultValueESet;
 		defaultValueESet = true;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE, oldDefaultValue, newDefaultValue, !oldDefaultValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE,
+					oldDefaultValue, newDefaultValue, !oldDefaultValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefaultValue(AttributeValueDate newDefaultValue) {
 		if (newDefaultValue != defaultValue) {
 			NotificationChain msgs = null;
 			if (defaultValue != null)
-				msgs = ((InternalEObject)defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE, null, msgs);
+				msgs = ((InternalEObject) defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE, null, msgs);
 			if (newDefaultValue != null)
-				msgs = ((InternalEObject)newDefaultValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE, null, msgs);
+				msgs = ((InternalEObject) newDefaultValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE, null, msgs);
 			msgs = basicSetDefaultValue(newDefaultValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldDefaultValueESet = defaultValueESet;
 			defaultValueESet = true;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE, newDefaultValue, newDefaultValue, !oldDefaultValueESet));
+				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE, newDefaultValue,
+						newDefaultValue, !oldDefaultValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetDefaultValue(NotificationChain msgs) {
@@ -219,35 +221,41 @@
 		boolean oldDefaultValueESet = defaultValueESet;
 		defaultValueESet = false;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE, oldDefaultValue, null, oldDefaultValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE,
+					oldDefaultValue, null, oldDefaultValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDefaultValue() {
 		if (defaultValue != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject)defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE, null, msgs);
+			msgs = ((InternalEObject) defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+					- ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE, null, msgs);
 			msgs = basicUnsetDefaultValue(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldDefaultValueESet = defaultValueESet;
 			defaultValueESet = false;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE, null, null, oldDefaultValueESet));
+				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE, null, null,
+						oldDefaultValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDefaultValue() {
@@ -255,86 +263,87 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE:
-				return basicUnsetDefaultValue(msgs);
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE:
+			return basicUnsetDefaultValue(msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE:
-				return getDefaultValue();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__TYPE:
+			if (resolve)
+				return getType();
+			return basicGetType();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE:
+			return getDefaultValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__TYPE:
-				setType((DatatypeDefinitionDate)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE:
-				setDefaultValue((AttributeValueDate)newValue);
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__TYPE:
+			setType((DatatypeDefinitionDate) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE:
+			setDefaultValue((AttributeValueDate) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__TYPE:
-				unsetType();
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE:
-				unsetDefaultValue();
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__TYPE:
+			unsetType();
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE:
+			unsetDefaultValue();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__TYPE:
-				return isSetType();
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE:
-				return isSetDefaultValue();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__TYPE:
+			return isSetType();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE__DEFAULT_VALUE:
+			return isSetDefaultValue();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //AttributeDefinitionDateImpl
+} // AttributeDefinitionDateImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionEnumerationImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionEnumerationImpl.java
index 2d67c71..bcdb4da 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionEnumerationImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionEnumerationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,37 +13,33 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration;
 import org.eclipse.rmf.reqif10.AttributeValueEnumeration;
 import org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Definition Enumeration</b></em>'.
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Definition Enumeration</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionEnumerationImpl#isMultiValued <em>Multi Valued</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionEnumerationImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionEnumerationImpl#getDefaultValue <em>Default Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionEnumerationImpl#isMultiValued <em>Multi Valued</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionEnumerationImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionEnumerationImpl#getDefaultValue <em>Default Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AttributeDefinitionEnumerationImpl extends AttributeDefinitionImpl implements AttributeDefinitionEnumeration {
 	/**
-	 * The default value of the '{@link #isMultiValued() <em>Multi Valued</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isMultiValued() <em>Multi Valued</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isMultiValued()
 	 * @generated
 	 * @ordered
@@ -51,9 +47,9 @@
 	protected static final boolean MULTI_VALUED_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isMultiValued() <em>Multi Valued</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isMultiValued() <em>Multi Valued</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isMultiValued()
 	 * @generated
 	 * @ordered
@@ -61,18 +57,17 @@
 	protected boolean multiValued = MULTI_VALUED_EDEFAULT;
 
 	/**
-	 * This is true if the Multi Valued attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Multi Valued attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean multiValuedESet;
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -80,18 +75,17 @@
 	protected DatatypeDefinitionEnumeration type;
 
 	/**
-	 * This is true if the Type reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Type reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean typeESet;
 
 	/**
-	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDefaultValue()
 	 * @generated
 	 * @ordered
@@ -99,17 +93,17 @@
 	protected AttributeValueEnumeration defaultValue;
 
 	/**
-	 * This is true if the Default Value containment reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Default Value containment reference has been set. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean defaultValueESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeDefinitionEnumerationImpl() {
@@ -117,8 +111,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,8 +121,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isMultiValued() {
@@ -136,8 +130,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMultiValued(boolean newMultiValued) {
@@ -146,12 +140,13 @@
 		boolean oldMultiValuedESet = multiValuedESet;
 		multiValuedESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED, oldMultiValued, multiValued, !oldMultiValuedESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED, oldMultiValued,
+					multiValued, !oldMultiValuedESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetMultiValued() {
@@ -160,12 +155,13 @@
 		multiValued = MULTI_VALUED_EDEFAULT;
 		multiValuedESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED, oldMultiValued, MULTI_VALUED_EDEFAULT, oldMultiValuedESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED, oldMultiValued,
+					MULTI_VALUED_EDEFAULT, oldMultiValuedESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetMultiValued() {
@@ -173,14 +169,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionEnumeration getType() {
 		if (type != null && type.eIsProxy()) {
-			InternalEObject oldType = (InternalEObject)type;
-			type = (DatatypeDefinitionEnumeration)eResolveProxy(oldType);
+			InternalEObject oldType = (InternalEObject) type;
+			type = (DatatypeDefinitionEnumeration) eResolveProxy(oldType);
 			if (type != oldType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__TYPE, oldType, type));
@@ -190,8 +186,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionEnumeration basicGetType() {
@@ -199,8 +195,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(DatatypeDefinitionEnumeration newType) {
@@ -213,8 +209,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetType() {
@@ -227,8 +223,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetType() {
@@ -236,8 +232,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeValueEnumeration getDefaultValue() {
@@ -245,8 +241,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDefaultValue(AttributeValueEnumeration newDefaultValue, NotificationChain msgs) {
@@ -255,38 +251,45 @@
 		boolean oldDefaultValueESet = defaultValueESet;
 		defaultValueESet = true;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE, oldDefaultValue, newDefaultValue, !oldDefaultValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE, oldDefaultValue, newDefaultValue, !oldDefaultValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefaultValue(AttributeValueEnumeration newDefaultValue) {
 		if (newDefaultValue != defaultValue) {
 			NotificationChain msgs = null;
 			if (defaultValue != null)
-				msgs = ((InternalEObject)defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE, null, msgs);
+				msgs = ((InternalEObject) defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE, null, msgs);
 			if (newDefaultValue != null)
-				msgs = ((InternalEObject)newDefaultValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE, null, msgs);
+				msgs = ((InternalEObject) newDefaultValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE, null, msgs);
 			msgs = basicSetDefaultValue(newDefaultValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldDefaultValueESet = defaultValueESet;
 			defaultValueESet = true;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE, newDefaultValue, newDefaultValue, !oldDefaultValueESet));
+				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE,
+						newDefaultValue, newDefaultValue, !oldDefaultValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetDefaultValue(NotificationChain msgs) {
@@ -295,35 +298,41 @@
 		boolean oldDefaultValueESet = defaultValueESet;
 		defaultValueESet = false;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE, oldDefaultValue, null, oldDefaultValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET,
+					ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE, oldDefaultValue, null, oldDefaultValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDefaultValue() {
 		if (defaultValue != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject)defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE, null, msgs);
+			msgs = ((InternalEObject) defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+					- ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE, null, msgs);
 			msgs = basicUnsetDefaultValue(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldDefaultValueESet = defaultValueESet;
 			defaultValueESet = false;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE, null, null, oldDefaultValueESet));
+				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE, null, null,
+						oldDefaultValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDefaultValue() {
@@ -331,112 +340,117 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE:
-				return basicUnsetDefaultValue(msgs);
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE:
+			return basicUnsetDefaultValue(msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED:
-				return isMultiValued();
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE:
-				return getDefaultValue();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED:
+			return isMultiValued();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__TYPE:
+			if (resolve)
+				return getType();
+			return basicGetType();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE:
+			return getDefaultValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED:
-				setMultiValued((Boolean)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__TYPE:
-				setType((DatatypeDefinitionEnumeration)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE:
-				setDefaultValue((AttributeValueEnumeration)newValue);
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED:
+			setMultiValued((Boolean) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__TYPE:
+			setType((DatatypeDefinitionEnumeration) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE:
+			setDefaultValue((AttributeValueEnumeration) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED:
-				unsetMultiValued();
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__TYPE:
-				unsetType();
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE:
-				unsetDefaultValue();
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED:
+			unsetMultiValued();
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__TYPE:
+			unsetType();
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE:
+			unsetDefaultValue();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED:
-				return isSetMultiValued();
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__TYPE:
-				return isSetType();
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE:
-				return isSetDefaultValue();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__MULTI_VALUED:
+			return isSetMultiValued();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__TYPE:
+			return isSetType();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION__DEFAULT_VALUE:
+			return isSetDefaultValue();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (multiValued: ");
-		if (multiValuedESet) result.append(multiValued); else result.append("<unset>");
+		result.append(" (multiValued: "); //$NON-NLS-1$
+		if (multiValuedESet)
+			result.append(multiValued);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-} //AttributeDefinitionEnumerationImpl
+} // AttributeDefinitionEnumerationImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionImpl.java
index a050c39..d18a8d7 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,23 +12,21 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.rmf.reqif10.AttributeDefinition;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Definition</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Definition</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class AttributeDefinitionImpl extends AccessControlledElementImpl implements AttributeDefinition {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeDefinitionImpl() {
@@ -36,8 +34,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -45,4 +43,4 @@
 		return ReqIF10Package.Literals.ATTRIBUTE_DEFINITION;
 	}
 
-} //AttributeDefinitionImpl
+} // AttributeDefinitionImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionIntegerImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionIntegerImpl.java
index 929916d..b3c8e4a 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionIntegerImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionIntegerImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,36 +13,32 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.AttributeDefinitionInteger;
 import org.eclipse.rmf.reqif10.AttributeValueInteger;
 import org.eclipse.rmf.reqif10.DatatypeDefinitionInteger;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Definition Integer</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Definition Integer</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionIntegerImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionIntegerImpl#getDefaultValue <em>Default Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionIntegerImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionIntegerImpl#getDefaultValue <em>Default Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AttributeDefinitionIntegerImpl extends AttributeDefinitionSimpleImpl implements AttributeDefinitionInteger {
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -50,18 +46,17 @@
 	protected DatatypeDefinitionInteger type;
 
 	/**
-	 * This is true if the Type reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Type reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean typeESet;
 
 	/**
-	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDefaultValue()
 	 * @generated
 	 * @ordered
@@ -69,17 +64,17 @@
 	protected AttributeValueInteger defaultValue;
 
 	/**
-	 * This is true if the Default Value containment reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Default Value containment reference has been set. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean defaultValueESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeDefinitionIntegerImpl() {
@@ -87,8 +82,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,14 +92,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionInteger getType() {
 		if (type != null && type.eIsProxy()) {
-			InternalEObject oldType = (InternalEObject)type;
-			type = (DatatypeDefinitionInteger)eResolveProxy(oldType);
+			InternalEObject oldType = (InternalEObject) type;
+			type = (DatatypeDefinitionInteger) eResolveProxy(oldType);
 			if (type != oldType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__TYPE, oldType, type));
@@ -114,8 +109,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionInteger basicGetType() {
@@ -123,8 +118,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(DatatypeDefinitionInteger newType) {
@@ -137,8 +132,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetType() {
@@ -151,8 +146,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetType() {
@@ -160,8 +155,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeValueInteger getDefaultValue() {
@@ -169,8 +164,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDefaultValue(AttributeValueInteger newDefaultValue, NotificationChain msgs) {
@@ -179,38 +174,45 @@
 		boolean oldDefaultValueESet = defaultValueESet;
 		defaultValueESet = true;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE, oldDefaultValue, newDefaultValue, !oldDefaultValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE, oldDefaultValue, newDefaultValue, !oldDefaultValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefaultValue(AttributeValueInteger newDefaultValue) {
 		if (newDefaultValue != defaultValue) {
 			NotificationChain msgs = null;
 			if (defaultValue != null)
-				msgs = ((InternalEObject)defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE, null, msgs);
+				msgs = ((InternalEObject) defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE, null, msgs);
 			if (newDefaultValue != null)
-				msgs = ((InternalEObject)newDefaultValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE, null, msgs);
+				msgs = ((InternalEObject) newDefaultValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE, null, msgs);
 			msgs = basicSetDefaultValue(newDefaultValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldDefaultValueESet = defaultValueESet;
 			defaultValueESet = true;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE, newDefaultValue, newDefaultValue, !oldDefaultValueESet));
+				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE, newDefaultValue,
+						newDefaultValue, !oldDefaultValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetDefaultValue(NotificationChain msgs) {
@@ -219,35 +221,41 @@
 		boolean oldDefaultValueESet = defaultValueESet;
 		defaultValueESet = false;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE, oldDefaultValue, null, oldDefaultValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET,
+					ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE, oldDefaultValue, null, oldDefaultValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDefaultValue() {
 		if (defaultValue != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject)defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE, null, msgs);
+			msgs = ((InternalEObject) defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+					- ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE, null, msgs);
 			msgs = basicUnsetDefaultValue(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldDefaultValueESet = defaultValueESet;
 			defaultValueESet = false;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE, null, null, oldDefaultValueESet));
+				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE, null, null,
+						oldDefaultValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDefaultValue() {
@@ -255,86 +263,87 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE:
-				return basicUnsetDefaultValue(msgs);
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE:
+			return basicUnsetDefaultValue(msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE:
-				return getDefaultValue();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__TYPE:
+			if (resolve)
+				return getType();
+			return basicGetType();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE:
+			return getDefaultValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__TYPE:
-				setType((DatatypeDefinitionInteger)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE:
-				setDefaultValue((AttributeValueInteger)newValue);
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__TYPE:
+			setType((DatatypeDefinitionInteger) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE:
+			setDefaultValue((AttributeValueInteger) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__TYPE:
-				unsetType();
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE:
-				unsetDefaultValue();
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__TYPE:
+			unsetType();
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE:
+			unsetDefaultValue();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__TYPE:
-				return isSetType();
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE:
-				return isSetDefaultValue();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__TYPE:
+			return isSetType();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER__DEFAULT_VALUE:
+			return isSetDefaultValue();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //AttributeDefinitionIntegerImpl
+} // AttributeDefinitionIntegerImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionRealImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionRealImpl.java
index cdaf433..36f6f50 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionRealImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionRealImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,36 +13,32 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.AttributeDefinitionReal;
 import org.eclipse.rmf.reqif10.AttributeValueReal;
 import org.eclipse.rmf.reqif10.DatatypeDefinitionReal;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Definition Real</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Definition Real</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionRealImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionRealImpl#getDefaultValue <em>Default Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionRealImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionRealImpl#getDefaultValue <em>Default Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AttributeDefinitionRealImpl extends AttributeDefinitionSimpleImpl implements AttributeDefinitionReal {
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -50,18 +46,17 @@
 	protected DatatypeDefinitionReal type;
 
 	/**
-	 * This is true if the Type reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Type reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean typeESet;
 
 	/**
-	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDefaultValue()
 	 * @generated
 	 * @ordered
@@ -69,17 +64,17 @@
 	protected AttributeValueReal defaultValue;
 
 	/**
-	 * This is true if the Default Value containment reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Default Value containment reference has been set. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean defaultValueESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeDefinitionRealImpl() {
@@ -87,8 +82,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,14 +92,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionReal getType() {
 		if (type != null && type.eIsProxy()) {
-			InternalEObject oldType = (InternalEObject)type;
-			type = (DatatypeDefinitionReal)eResolveProxy(oldType);
+			InternalEObject oldType = (InternalEObject) type;
+			type = (DatatypeDefinitionReal) eResolveProxy(oldType);
 			if (type != oldType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__TYPE, oldType, type));
@@ -114,8 +109,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionReal basicGetType() {
@@ -123,8 +118,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(DatatypeDefinitionReal newType) {
@@ -137,8 +132,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetType() {
@@ -151,8 +146,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetType() {
@@ -160,8 +155,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeValueReal getDefaultValue() {
@@ -169,8 +164,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDefaultValue(AttributeValueReal newDefaultValue, NotificationChain msgs) {
@@ -179,38 +174,45 @@
 		boolean oldDefaultValueESet = defaultValueESet;
 		defaultValueESet = true;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE, oldDefaultValue, newDefaultValue, !oldDefaultValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE,
+					oldDefaultValue, newDefaultValue, !oldDefaultValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefaultValue(AttributeValueReal newDefaultValue) {
 		if (newDefaultValue != defaultValue) {
 			NotificationChain msgs = null;
 			if (defaultValue != null)
-				msgs = ((InternalEObject)defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE, null, msgs);
+				msgs = ((InternalEObject) defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE, null, msgs);
 			if (newDefaultValue != null)
-				msgs = ((InternalEObject)newDefaultValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE, null, msgs);
+				msgs = ((InternalEObject) newDefaultValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE, null, msgs);
 			msgs = basicSetDefaultValue(newDefaultValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldDefaultValueESet = defaultValueESet;
 			defaultValueESet = true;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE, newDefaultValue, newDefaultValue, !oldDefaultValueESet));
+				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE, newDefaultValue,
+						newDefaultValue, !oldDefaultValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetDefaultValue(NotificationChain msgs) {
@@ -219,35 +221,41 @@
 		boolean oldDefaultValueESet = defaultValueESet;
 		defaultValueESet = false;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE, oldDefaultValue, null, oldDefaultValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE,
+					oldDefaultValue, null, oldDefaultValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDefaultValue() {
 		if (defaultValue != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject)defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE, null, msgs);
+			msgs = ((InternalEObject) defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+					- ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE, null, msgs);
 			msgs = basicUnsetDefaultValue(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldDefaultValueESet = defaultValueESet;
 			defaultValueESet = false;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE, null, null, oldDefaultValueESet));
+				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE, null, null,
+						oldDefaultValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDefaultValue() {
@@ -255,86 +263,87 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE:
-				return basicUnsetDefaultValue(msgs);
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE:
+			return basicUnsetDefaultValue(msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE:
-				return getDefaultValue();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__TYPE:
+			if (resolve)
+				return getType();
+			return basicGetType();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE:
+			return getDefaultValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__TYPE:
-				setType((DatatypeDefinitionReal)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE:
-				setDefaultValue((AttributeValueReal)newValue);
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__TYPE:
+			setType((DatatypeDefinitionReal) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE:
+			setDefaultValue((AttributeValueReal) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__TYPE:
-				unsetType();
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE:
-				unsetDefaultValue();
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__TYPE:
+			unsetType();
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE:
+			unsetDefaultValue();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__TYPE:
-				return isSetType();
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE:
-				return isSetDefaultValue();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__TYPE:
+			return isSetType();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL__DEFAULT_VALUE:
+			return isSetDefaultValue();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //AttributeDefinitionRealImpl
+} // AttributeDefinitionRealImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionSimpleImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionSimpleImpl.java
index 98e62b5..a715231 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionSimpleImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionSimpleImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,23 +12,21 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.rmf.reqif10.AttributeDefinitionSimple;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Definition Simple</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Definition Simple</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class AttributeDefinitionSimpleImpl extends AttributeDefinitionImpl implements AttributeDefinitionSimple {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeDefinitionSimpleImpl() {
@@ -36,8 +34,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -45,4 +43,4 @@
 		return ReqIF10Package.Literals.ATTRIBUTE_DEFINITION_SIMPLE;
 	}
 
-} //AttributeDefinitionSimpleImpl
+} // AttributeDefinitionSimpleImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionStringImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionStringImpl.java
index a9d77ec..9318bbc 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionStringImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionStringImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,36 +13,32 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.AttributeDefinitionString;
 import org.eclipse.rmf.reqif10.AttributeValueString;
 import org.eclipse.rmf.reqif10.DatatypeDefinitionString;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Definition String</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Definition String</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionStringImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionStringImpl#getDefaultValue <em>Default Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionStringImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionStringImpl#getDefaultValue <em>Default Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AttributeDefinitionStringImpl extends AttributeDefinitionSimpleImpl implements AttributeDefinitionString {
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -50,18 +46,17 @@
 	protected DatatypeDefinitionString type;
 
 	/**
-	 * This is true if the Type reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Type reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean typeESet;
 
 	/**
-	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDefaultValue()
 	 * @generated
 	 * @ordered
@@ -69,17 +64,17 @@
 	protected AttributeValueString defaultValue;
 
 	/**
-	 * This is true if the Default Value containment reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Default Value containment reference has been set. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean defaultValueESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeDefinitionStringImpl() {
@@ -87,8 +82,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,14 +92,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionString getType() {
 		if (type != null && type.eIsProxy()) {
-			InternalEObject oldType = (InternalEObject)type;
-			type = (DatatypeDefinitionString)eResolveProxy(oldType);
+			InternalEObject oldType = (InternalEObject) type;
+			type = (DatatypeDefinitionString) eResolveProxy(oldType);
 			if (type != oldType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__TYPE, oldType, type));
@@ -114,8 +109,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionString basicGetType() {
@@ -123,8 +118,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(DatatypeDefinitionString newType) {
@@ -137,8 +132,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetType() {
@@ -151,8 +146,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetType() {
@@ -160,8 +155,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeValueString getDefaultValue() {
@@ -169,8 +164,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDefaultValue(AttributeValueString newDefaultValue, NotificationChain msgs) {
@@ -179,38 +174,45 @@
 		boolean oldDefaultValueESet = defaultValueESet;
 		defaultValueESet = true;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE, oldDefaultValue, newDefaultValue, !oldDefaultValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE,
+					oldDefaultValue, newDefaultValue, !oldDefaultValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefaultValue(AttributeValueString newDefaultValue) {
 		if (newDefaultValue != defaultValue) {
 			NotificationChain msgs = null;
 			if (defaultValue != null)
-				msgs = ((InternalEObject)defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE, null, msgs);
+				msgs = ((InternalEObject) defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE, null, msgs);
 			if (newDefaultValue != null)
-				msgs = ((InternalEObject)newDefaultValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE, null, msgs);
+				msgs = ((InternalEObject) newDefaultValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE, null, msgs);
 			msgs = basicSetDefaultValue(newDefaultValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldDefaultValueESet = defaultValueESet;
 			defaultValueESet = true;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE, newDefaultValue, newDefaultValue, !oldDefaultValueESet));
+				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE, newDefaultValue,
+						newDefaultValue, !oldDefaultValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetDefaultValue(NotificationChain msgs) {
@@ -219,35 +221,41 @@
 		boolean oldDefaultValueESet = defaultValueESet;
 		defaultValueESet = false;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE, oldDefaultValue, null, oldDefaultValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET,
+					ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE, oldDefaultValue, null, oldDefaultValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDefaultValue() {
 		if (defaultValue != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject)defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE, null, msgs);
+			msgs = ((InternalEObject) defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+					- ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE, null, msgs);
 			msgs = basicUnsetDefaultValue(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldDefaultValueESet = defaultValueESet;
 			defaultValueESet = false;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE, null, null, oldDefaultValueESet));
+				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE, null, null,
+						oldDefaultValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDefaultValue() {
@@ -255,86 +263,87 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE:
-				return basicUnsetDefaultValue(msgs);
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE:
+			return basicUnsetDefaultValue(msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE:
-				return getDefaultValue();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__TYPE:
+			if (resolve)
+				return getType();
+			return basicGetType();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE:
+			return getDefaultValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__TYPE:
-				setType((DatatypeDefinitionString)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE:
-				setDefaultValue((AttributeValueString)newValue);
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__TYPE:
+			setType((DatatypeDefinitionString) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE:
+			setDefaultValue((AttributeValueString) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__TYPE:
-				unsetType();
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE:
-				unsetDefaultValue();
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__TYPE:
+			unsetType();
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE:
+			unsetDefaultValue();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__TYPE:
-				return isSetType();
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE:
-				return isSetDefaultValue();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__TYPE:
+			return isSetType();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING__DEFAULT_VALUE:
+			return isSetDefaultValue();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //AttributeDefinitionStringImpl
+} // AttributeDefinitionStringImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionXHTMLImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionXHTMLImpl.java
index db53690..43cb7e7 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionXHTMLImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeDefinitionXHTMLImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,36 +13,32 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.AttributeDefinitionXHTML;
 import org.eclipse.rmf.reqif10.AttributeValueXHTML;
 import org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Definition XHTML</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Definition XHTML</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionXHTMLImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionXHTMLImpl#getDefaultValue <em>Default Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionXHTMLImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeDefinitionXHTMLImpl#getDefaultValue <em>Default Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AttributeDefinitionXHTMLImpl extends AttributeDefinitionImpl implements AttributeDefinitionXHTML {
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -50,18 +46,17 @@
 	protected DatatypeDefinitionXHTML type;
 
 	/**
-	 * This is true if the Type reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Type reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean typeESet;
 
 	/**
-	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDefaultValue()
 	 * @generated
 	 * @ordered
@@ -69,17 +64,17 @@
 	protected AttributeValueXHTML defaultValue;
 
 	/**
-	 * This is true if the Default Value containment reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Default Value containment reference has been set. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean defaultValueESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeDefinitionXHTMLImpl() {
@@ -87,8 +82,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,14 +92,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionXHTML getType() {
 		if (type != null && type.eIsProxy()) {
-			InternalEObject oldType = (InternalEObject)type;
-			type = (DatatypeDefinitionXHTML)eResolveProxy(oldType);
+			InternalEObject oldType = (InternalEObject) type;
+			type = (DatatypeDefinitionXHTML) eResolveProxy(oldType);
 			if (type != oldType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__TYPE, oldType, type));
@@ -114,8 +109,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypeDefinitionXHTML basicGetType() {
@@ -123,8 +118,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(DatatypeDefinitionXHTML newType) {
@@ -137,8 +132,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetType() {
@@ -151,8 +146,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetType() {
@@ -160,8 +155,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeValueXHTML getDefaultValue() {
@@ -169,8 +164,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDefaultValue(AttributeValueXHTML newDefaultValue, NotificationChain msgs) {
@@ -179,38 +174,45 @@
 		boolean oldDefaultValueESet = defaultValueESet;
 		defaultValueESet = true;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE, oldDefaultValue, newDefaultValue, !oldDefaultValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE,
+					oldDefaultValue, newDefaultValue, !oldDefaultValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefaultValue(AttributeValueXHTML newDefaultValue) {
 		if (newDefaultValue != defaultValue) {
 			NotificationChain msgs = null;
 			if (defaultValue != null)
-				msgs = ((InternalEObject)defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE, null, msgs);
+				msgs = ((InternalEObject) defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE, null, msgs);
 			if (newDefaultValue != null)
-				msgs = ((InternalEObject)newDefaultValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE, null, msgs);
+				msgs = ((InternalEObject) newDefaultValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE, null, msgs);
 			msgs = basicSetDefaultValue(newDefaultValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldDefaultValueESet = defaultValueESet;
 			defaultValueESet = true;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE, newDefaultValue, newDefaultValue, !oldDefaultValueESet));
+				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE, newDefaultValue,
+						newDefaultValue, !oldDefaultValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetDefaultValue(NotificationChain msgs) {
@@ -219,35 +221,41 @@
 		boolean oldDefaultValueESet = defaultValueESet;
 		defaultValueESet = false;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE, oldDefaultValue, null, oldDefaultValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET,
+					ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE, oldDefaultValue, null, oldDefaultValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDefaultValue() {
 		if (defaultValue != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject)defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE, null, msgs);
+			msgs = ((InternalEObject) defaultValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+					- ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE, null, msgs);
 			msgs = basicUnsetDefaultValue(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldDefaultValueESet = defaultValueESet;
 			defaultValueESet = false;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE, null, null, oldDefaultValueESet));
+				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE, null, null,
+						oldDefaultValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDefaultValue() {
@@ -255,86 +263,87 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE:
-				return basicUnsetDefaultValue(msgs);
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE:
+			return basicUnsetDefaultValue(msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE:
-				return getDefaultValue();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__TYPE:
+			if (resolve)
+				return getType();
+			return basicGetType();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE:
+			return getDefaultValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__TYPE:
-				setType((DatatypeDefinitionXHTML)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE:
-				setDefaultValue((AttributeValueXHTML)newValue);
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__TYPE:
+			setType((DatatypeDefinitionXHTML) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE:
+			setDefaultValue((AttributeValueXHTML) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__TYPE:
-				unsetType();
-				return;
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE:
-				unsetDefaultValue();
-				return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__TYPE:
+			unsetType();
+			return;
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE:
+			unsetDefaultValue();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__TYPE:
-				return isSetType();
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE:
-				return isSetDefaultValue();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__TYPE:
+			return isSetType();
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML__DEFAULT_VALUE:
+			return isSetDefaultValue();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //AttributeDefinitionXHTMLImpl
+} // AttributeDefinitionXHTMLImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueBooleanImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueBooleanImpl.java
index 3e3ea5d..5d59c7f 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueBooleanImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueBooleanImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,35 +12,31 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.AttributeDefinitionBoolean;
 import org.eclipse.rmf.reqif10.AttributeValueBoolean;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Value Boolean</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Value Boolean</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueBooleanImpl#isTheValue <em>The Value</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueBooleanImpl#getDefinition <em>Definition</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueBooleanImpl#isTheValue <em>The Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueBooleanImpl#getDefinition <em>Definition</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AttributeValueBooleanImpl extends AttributeValueSimpleImpl implements AttributeValueBoolean {
 	/**
-	 * The default value of the '{@link #isTheValue() <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isTheValue() <em>The Value</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isTheValue()
 	 * @generated
 	 * @ordered
@@ -48,9 +44,9 @@
 	protected static final boolean THE_VALUE_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isTheValue() <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isTheValue() <em>The Value</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isTheValue()
 	 * @generated
 	 * @ordered
@@ -58,18 +54,17 @@
 	protected boolean theValue = THE_VALUE_EDEFAULT;
 
 	/**
-	 * This is true if the The Value attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the The Value attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean theValueESet;
 
 	/**
-	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getDefinition()
 	 * @generated
 	 * @ordered
@@ -77,17 +72,16 @@
 	protected AttributeDefinitionBoolean definition;
 
 	/**
-	 * This is true if the Definition reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Definition reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean definitionESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeValueBooleanImpl() {
@@ -95,8 +89,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -105,8 +99,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isTheValue() {
@@ -114,8 +108,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTheValue(boolean newTheValue) {
@@ -124,12 +118,13 @@
 		boolean oldTheValueESet = theValueESet;
 		theValueESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE, oldTheValue, theValue, !oldTheValueESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE, oldTheValue, theValue,
+					!oldTheValueESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetTheValue() {
@@ -138,12 +133,13 @@
 		theValue = THE_VALUE_EDEFAULT;
 		theValueESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE, oldTheValue, THE_VALUE_EDEFAULT, oldTheValueESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE, oldTheValue,
+					THE_VALUE_EDEFAULT, oldTheValueESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetTheValue() {
@@ -151,25 +147,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionBoolean getDefinition() {
 		if (definition != null && definition.eIsProxy()) {
-			InternalEObject oldDefinition = (InternalEObject)definition;
-			definition = (AttributeDefinitionBoolean)eResolveProxy(oldDefinition);
+			InternalEObject oldDefinition = (InternalEObject) definition;
+			definition = (AttributeDefinitionBoolean) eResolveProxy(oldDefinition);
 			if (definition != oldDefinition) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__DEFINITION, oldDefinition, definition));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__DEFINITION, oldDefinition,
+							definition));
 			}
 		}
 		return definition;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionBoolean basicGetDefinition() {
@@ -177,8 +174,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefinition(AttributeDefinitionBoolean newDefinition) {
@@ -187,12 +184,13 @@
 		boolean oldDefinitionESet = definitionESet;
 		definitionESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__DEFINITION, oldDefinition, definition, !oldDefinitionESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__DEFINITION, oldDefinition, definition,
+					!oldDefinitionESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDefinition() {
@@ -201,12 +199,13 @@
 		definition = null;
 		definitionESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__DEFINITION, oldDefinition, null, oldDefinitionESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__DEFINITION, oldDefinition, null,
+					oldDefinitionESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDefinition() {
@@ -214,88 +213,93 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE:
-				return isTheValue();
-			case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__DEFINITION:
-				if (resolve) return getDefinition();
-				return basicGetDefinition();
+		case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE:
+			return isTheValue();
+		case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__DEFINITION:
+			if (resolve)
+				return getDefinition();
+			return basicGetDefinition();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE:
-				setTheValue((Boolean)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__DEFINITION:
-				setDefinition((AttributeDefinitionBoolean)newValue);
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE:
+			setTheValue((Boolean) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__DEFINITION:
+			setDefinition((AttributeDefinitionBoolean) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE:
-				unsetTheValue();
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__DEFINITION:
-				unsetDefinition();
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE:
+			unsetTheValue();
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__DEFINITION:
+			unsetDefinition();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE:
-				return isSetTheValue();
-			case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__DEFINITION:
-				return isSetDefinition();
+		case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE:
+			return isSetTheValue();
+		case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN__DEFINITION:
+			return isSetDefinition();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (theValue: ");
-		if (theValueESet) result.append(theValue); else result.append("<unset>");
+		result.append(" (theValue: "); //$NON-NLS-1$
+		if (theValueESet)
+			result.append(theValue);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-} //AttributeValueBooleanImpl
+} // AttributeValueBooleanImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueDateImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueDateImpl.java
index 5e24f8f..dee6a2f 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueDateImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueDateImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -27,18 +27,18 @@
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueDateImpl#getTheValue <em>The Value</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueDateImpl#getDefinition <em>Definition</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueDateImpl#getTheValue <em>The Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueDateImpl#getDefinition <em>Definition</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AttributeValueDateImpl extends AttributeValueSimpleImpl implements AttributeValueDate {
 	/**
-	 * The default value of the '{@link #getTheValue() <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getTheValue() <em>The Value</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getTheValue()
 	 * @generated
 	 * @ordered
@@ -46,9 +46,9 @@
 	protected static final GregorianCalendar THE_VALUE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTheValue() <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getTheValue() <em>The Value</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getTheValue()
 	 * @generated
 	 * @ordered
@@ -56,17 +56,17 @@
 	protected GregorianCalendar theValue = THE_VALUE_EDEFAULT;
 
 	/**
-	 * This is true if the The Value attribute has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This is true if the The Value attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean theValueESet;
 
 	/**
-	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getDefinition()
 	 * @generated
 	 * @ordered
@@ -74,8 +74,8 @@
 	protected AttributeDefinitionDate definition;
 
 	/**
-	 * This is true if the Definition reference has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This is true if the Definition reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -83,6 +83,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeValueDateImpl() {
@@ -91,6 +92,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -100,6 +102,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GregorianCalendar getTheValue() {
@@ -108,6 +111,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTheValue(GregorianCalendar newTheValue) {
@@ -116,11 +120,13 @@
 		boolean oldTheValueESet = theValueESet;
 		theValueESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_DATE__THE_VALUE, oldTheValue, theValue, !oldTheValueESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_DATE__THE_VALUE, oldTheValue, theValue,
+					!oldTheValueESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetTheValue() {
@@ -129,11 +135,13 @@
 		theValue = THE_VALUE_EDEFAULT;
 		theValueESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_DATE__THE_VALUE, oldTheValue, THE_VALUE_EDEFAULT, oldTheValueESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_DATE__THE_VALUE, oldTheValue, THE_VALUE_EDEFAULT,
+					oldTheValueESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetTheValue() {
@@ -142,15 +150,17 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionDate getDefinition() {
 		if (definition != null && definition.eIsProxy()) {
-			InternalEObject oldDefinition = (InternalEObject)definition;
-			definition = (AttributeDefinitionDate)eResolveProxy(oldDefinition);
+			InternalEObject oldDefinition = (InternalEObject) definition;
+			definition = (AttributeDefinitionDate) eResolveProxy(oldDefinition);
 			if (definition != oldDefinition) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_VALUE_DATE__DEFINITION, oldDefinition, definition));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_VALUE_DATE__DEFINITION, oldDefinition,
+							definition));
 			}
 		}
 		return definition;
@@ -158,6 +168,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionDate basicGetDefinition() {
@@ -166,6 +177,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefinition(AttributeDefinitionDate newDefinition) {
@@ -174,11 +186,13 @@
 		boolean oldDefinitionESet = definitionESet;
 		definitionESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_DATE__DEFINITION, oldDefinition, definition, !oldDefinitionESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_DATE__DEFINITION, oldDefinition, definition,
+					!oldDefinitionESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDefinition() {
@@ -187,11 +201,13 @@
 		definition = null;
 		definitionESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_DATE__DEFINITION, oldDefinition, null, oldDefinitionESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_DATE__DEFINITION, oldDefinition, null,
+					oldDefinitionESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDefinition() {
@@ -200,80 +216,90 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_DATE__THE_VALUE:
-				return getTheValue();
-			case ReqIF10Package.ATTRIBUTE_VALUE_DATE__DEFINITION:
-				if (resolve) return getDefinition();
-				return basicGetDefinition();
+		case ReqIF10Package.ATTRIBUTE_VALUE_DATE__THE_VALUE:
+			return getTheValue();
+		case ReqIF10Package.ATTRIBUTE_VALUE_DATE__DEFINITION:
+			if (resolve)
+				return getDefinition();
+			return basicGetDefinition();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_DATE__THE_VALUE:
-				setTheValue((GregorianCalendar)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_DATE__DEFINITION:
-				setDefinition((AttributeDefinitionDate)newValue);
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_DATE__THE_VALUE:
+			setTheValue((GregorianCalendar) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_DATE__DEFINITION:
+			setDefinition((AttributeDefinitionDate) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_DATE__THE_VALUE:
-				unsetTheValue();
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_DATE__DEFINITION:
-				unsetDefinition();
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_DATE__THE_VALUE:
+			unsetTheValue();
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_DATE__DEFINITION:
+			unsetDefinition();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_DATE__THE_VALUE:
-				return isSetTheValue();
-			case ReqIF10Package.ATTRIBUTE_VALUE_DATE__DEFINITION:
-				return isSetDefinition();
+		case ReqIF10Package.ATTRIBUTE_VALUE_DATE__THE_VALUE:
+			return isSetTheValue();
+		case ReqIF10Package.ATTRIBUTE_VALUE_DATE__DEFINITION:
+			return isSetDefinition();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (theValue: ");
-		if (theValueESet) result.append(theValue); else result.append("<unset>");
+		result.append(" (theValue: "); //$NON-NLS-1$
+		if (theValueESet)
+			result.append(theValue);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueEnumerationImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueEnumerationImpl.java
index b46fb0c..6aba2f5 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueEnumerationImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueEnumerationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,41 +14,35 @@
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration;
 import org.eclipse.rmf.reqif10.AttributeValueEnumeration;
 import org.eclipse.rmf.reqif10.EnumValue;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Value Enumeration</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Value Enumeration</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueEnumerationImpl#getValues <em>Values</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueEnumerationImpl#getDefinition <em>Definition</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueEnumerationImpl#getValues <em>Values</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueEnumerationImpl#getDefinition <em>Definition</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AttributeValueEnumerationImpl extends AttributeValueImpl implements AttributeValueEnumeration {
 	/**
-	 * The cached value of the '{@link #getValues() <em>Values</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getValues() <em>Values</em>}' reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValues()
 	 * @generated
 	 * @ordered
@@ -56,9 +50,9 @@
 	protected EList<EnumValue> values;
 
 	/**
-	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getDefinition()
 	 * @generated
 	 * @ordered
@@ -66,17 +60,16 @@
 	protected AttributeDefinitionEnumeration definition;
 
 	/**
-	 * This is true if the Definition reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Definition reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean definitionESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeValueEnumerationImpl() {
@@ -84,8 +77,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -94,8 +87,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<EnumValue> getValues() {
@@ -106,43 +99,45 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetValues() {
-		if (values != null) ((InternalEList.Unsettable<?>)values).unset();
+		if (values != null)
+			((InternalEList.Unsettable<?>) values).unset();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetValues() {
-		return values != null && ((InternalEList.Unsettable<?>)values).isSet();
+		return values != null && ((InternalEList.Unsettable<?>) values).isSet();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionEnumeration getDefinition() {
 		if (definition != null && definition.eIsProxy()) {
-			InternalEObject oldDefinition = (InternalEObject)definition;
-			definition = (AttributeDefinitionEnumeration)eResolveProxy(oldDefinition);
+			InternalEObject oldDefinition = (InternalEObject) definition;
+			definition = (AttributeDefinitionEnumeration) eResolveProxy(oldDefinition);
 			if (definition != oldDefinition) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__DEFINITION, oldDefinition, definition));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__DEFINITION, oldDefinition,
+							definition));
 			}
 		}
 		return definition;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionEnumeration basicGetDefinition() {
@@ -150,8 +145,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefinition(AttributeDefinitionEnumeration newDefinition) {
@@ -160,12 +155,13 @@
 		boolean oldDefinitionESet = definitionESet;
 		definitionESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__DEFINITION, oldDefinition, definition, !oldDefinitionESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__DEFINITION, oldDefinition, definition,
+					!oldDefinitionESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDefinition() {
@@ -174,12 +170,13 @@
 		definition = null;
 		definitionESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__DEFINITION, oldDefinition, null, oldDefinitionESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__DEFINITION, oldDefinition, null,
+					oldDefinitionESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDefinition() {
@@ -187,74 +184,75 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__VALUES:
-				return getValues();
-			case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__DEFINITION:
-				if (resolve) return getDefinition();
-				return basicGetDefinition();
+		case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__VALUES:
+			return getValues();
+		case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__DEFINITION:
+			if (resolve)
+				return getDefinition();
+			return basicGetDefinition();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__VALUES:
-				getValues().clear();
-				getValues().addAll((Collection<? extends EnumValue>)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__DEFINITION:
-				setDefinition((AttributeDefinitionEnumeration)newValue);
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__VALUES:
+			getValues().clear();
+			getValues().addAll((Collection<? extends EnumValue>) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__DEFINITION:
+			setDefinition((AttributeDefinitionEnumeration) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__VALUES:
-				unsetValues();
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__DEFINITION:
-				unsetDefinition();
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__VALUES:
+			unsetValues();
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__DEFINITION:
+			unsetDefinition();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__VALUES:
-				return isSetValues();
-			case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__DEFINITION:
-				return isSetDefinition();
+		case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__VALUES:
+			return isSetValues();
+		case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION__DEFINITION:
+			return isSetDefinition();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //AttributeValueEnumerationImpl
+} // AttributeValueEnumerationImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueImpl.java
index cb9627c..faffa5e 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,25 +12,22 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.rmf.reqif10.AttributeValue;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Value</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Value</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
-public abstract class AttributeValueImpl extends EObjectImpl implements AttributeValue {
+public abstract class AttributeValueImpl extends MinimalEObjectImpl implements AttributeValue {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeValueImpl() {
@@ -38,8 +35,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -47,4 +44,4 @@
 		return ReqIF10Package.Literals.ATTRIBUTE_VALUE;
 	}
 
-} //AttributeValueImpl
+} // AttributeValueImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueIntegerImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueIntegerImpl.java
index 6a6c422..32e6388 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueIntegerImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueIntegerImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,35 +14,31 @@
 import java.math.BigInteger;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.AttributeDefinitionInteger;
 import org.eclipse.rmf.reqif10.AttributeValueInteger;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Value Integer</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Value Integer</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueIntegerImpl#getTheValue <em>The Value</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueIntegerImpl#getDefinition <em>Definition</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueIntegerImpl#getTheValue <em>The Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueIntegerImpl#getDefinition <em>Definition</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AttributeValueIntegerImpl extends AttributeValueSimpleImpl implements AttributeValueInteger {
 	/**
-	 * The default value of the '{@link #getTheValue() <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTheValue() <em>The Value</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTheValue()
 	 * @generated
 	 * @ordered
@@ -50,9 +46,9 @@
 	protected static final BigInteger THE_VALUE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTheValue() <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTheValue() <em>The Value</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTheValue()
 	 * @generated
 	 * @ordered
@@ -60,18 +56,17 @@
 	protected BigInteger theValue = THE_VALUE_EDEFAULT;
 
 	/**
-	 * This is true if the The Value attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the The Value attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean theValueESet;
 
 	/**
-	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getDefinition()
 	 * @generated
 	 * @ordered
@@ -79,17 +74,16 @@
 	protected AttributeDefinitionInteger definition;
 
 	/**
-	 * This is true if the Definition reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Definition reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean definitionESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeValueIntegerImpl() {
@@ -97,8 +91,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -107,8 +101,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger getTheValue() {
@@ -116,8 +110,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTheValue(BigInteger newTheValue) {
@@ -126,12 +120,13 @@
 		boolean oldTheValueESet = theValueESet;
 		theValueESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__THE_VALUE, oldTheValue, theValue, !oldTheValueESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__THE_VALUE, oldTheValue, theValue,
+					!oldTheValueESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetTheValue() {
@@ -140,12 +135,13 @@
 		theValue = THE_VALUE_EDEFAULT;
 		theValueESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__THE_VALUE, oldTheValue, THE_VALUE_EDEFAULT, oldTheValueESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__THE_VALUE, oldTheValue,
+					THE_VALUE_EDEFAULT, oldTheValueESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetTheValue() {
@@ -153,25 +149,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionInteger getDefinition() {
 		if (definition != null && definition.eIsProxy()) {
-			InternalEObject oldDefinition = (InternalEObject)definition;
-			definition = (AttributeDefinitionInteger)eResolveProxy(oldDefinition);
+			InternalEObject oldDefinition = (InternalEObject) definition;
+			definition = (AttributeDefinitionInteger) eResolveProxy(oldDefinition);
 			if (definition != oldDefinition) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__DEFINITION, oldDefinition, definition));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__DEFINITION, oldDefinition,
+							definition));
 			}
 		}
 		return definition;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionInteger basicGetDefinition() {
@@ -179,8 +176,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefinition(AttributeDefinitionInteger newDefinition) {
@@ -189,12 +186,13 @@
 		boolean oldDefinitionESet = definitionESet;
 		definitionESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__DEFINITION, oldDefinition, definition, !oldDefinitionESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__DEFINITION, oldDefinition, definition,
+					!oldDefinitionESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDefinition() {
@@ -203,12 +201,13 @@
 		definition = null;
 		definitionESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__DEFINITION, oldDefinition, null, oldDefinitionESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__DEFINITION, oldDefinition, null,
+					oldDefinitionESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDefinition() {
@@ -216,88 +215,93 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__THE_VALUE:
-				return getTheValue();
-			case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__DEFINITION:
-				if (resolve) return getDefinition();
-				return basicGetDefinition();
+		case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__THE_VALUE:
+			return getTheValue();
+		case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__DEFINITION:
+			if (resolve)
+				return getDefinition();
+			return basicGetDefinition();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__THE_VALUE:
-				setTheValue((BigInteger)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__DEFINITION:
-				setDefinition((AttributeDefinitionInteger)newValue);
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__THE_VALUE:
+			setTheValue((BigInteger) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__DEFINITION:
+			setDefinition((AttributeDefinitionInteger) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__THE_VALUE:
-				unsetTheValue();
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__DEFINITION:
-				unsetDefinition();
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__THE_VALUE:
+			unsetTheValue();
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__DEFINITION:
+			unsetDefinition();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__THE_VALUE:
-				return isSetTheValue();
-			case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__DEFINITION:
-				return isSetDefinition();
+		case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__THE_VALUE:
+			return isSetTheValue();
+		case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER__DEFINITION:
+			return isSetDefinition();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (theValue: ");
-		if (theValueESet) result.append(theValue); else result.append("<unset>");
+		result.append(" (theValue: "); //$NON-NLS-1$
+		if (theValueESet)
+			result.append(theValue);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-} //AttributeValueIntegerImpl
+} // AttributeValueIntegerImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueRealImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueRealImpl.java
index fcec14f..6f99f34 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueRealImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueRealImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,35 +12,31 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.AttributeDefinitionReal;
 import org.eclipse.rmf.reqif10.AttributeValueReal;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Value Real</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Value Real</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueRealImpl#getTheValue <em>The Value</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueRealImpl#getDefinition <em>Definition</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueRealImpl#getTheValue <em>The Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueRealImpl#getDefinition <em>Definition</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AttributeValueRealImpl extends AttributeValueSimpleImpl implements AttributeValueReal {
 	/**
-	 * The default value of the '{@link #getTheValue() <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTheValue() <em>The Value</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTheValue()
 	 * @generated
 	 * @ordered
@@ -48,9 +44,9 @@
 	protected static final double THE_VALUE_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getTheValue() <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTheValue() <em>The Value</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTheValue()
 	 * @generated
 	 * @ordered
@@ -58,18 +54,17 @@
 	protected double theValue = THE_VALUE_EDEFAULT;
 
 	/**
-	 * This is true if the The Value attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the The Value attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean theValueESet;
 
 	/**
-	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getDefinition()
 	 * @generated
 	 * @ordered
@@ -77,17 +72,16 @@
 	protected AttributeDefinitionReal definition;
 
 	/**
-	 * This is true if the Definition reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Definition reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean definitionESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeValueRealImpl() {
@@ -95,8 +89,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -105,8 +99,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getTheValue() {
@@ -114,8 +108,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTheValue(double newTheValue) {
@@ -124,12 +118,13 @@
 		boolean oldTheValueESet = theValueESet;
 		theValueESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_REAL__THE_VALUE, oldTheValue, theValue, !oldTheValueESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_REAL__THE_VALUE, oldTheValue, theValue,
+					!oldTheValueESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetTheValue() {
@@ -138,12 +133,13 @@
 		theValue = THE_VALUE_EDEFAULT;
 		theValueESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_REAL__THE_VALUE, oldTheValue, THE_VALUE_EDEFAULT, oldTheValueESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_REAL__THE_VALUE, oldTheValue, THE_VALUE_EDEFAULT,
+					oldTheValueESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetTheValue() {
@@ -151,25 +147,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionReal getDefinition() {
 		if (definition != null && definition.eIsProxy()) {
-			InternalEObject oldDefinition = (InternalEObject)definition;
-			definition = (AttributeDefinitionReal)eResolveProxy(oldDefinition);
+			InternalEObject oldDefinition = (InternalEObject) definition;
+			definition = (AttributeDefinitionReal) eResolveProxy(oldDefinition);
 			if (definition != oldDefinition) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_VALUE_REAL__DEFINITION, oldDefinition, definition));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_VALUE_REAL__DEFINITION, oldDefinition,
+							definition));
 			}
 		}
 		return definition;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionReal basicGetDefinition() {
@@ -177,8 +174,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefinition(AttributeDefinitionReal newDefinition) {
@@ -187,12 +184,13 @@
 		boolean oldDefinitionESet = definitionESet;
 		definitionESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_REAL__DEFINITION, oldDefinition, definition, !oldDefinitionESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_REAL__DEFINITION, oldDefinition, definition,
+					!oldDefinitionESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDefinition() {
@@ -201,12 +199,13 @@
 		definition = null;
 		definitionESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_REAL__DEFINITION, oldDefinition, null, oldDefinitionESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_REAL__DEFINITION, oldDefinition, null,
+					oldDefinitionESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDefinition() {
@@ -214,88 +213,93 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_REAL__THE_VALUE:
-				return getTheValue();
-			case ReqIF10Package.ATTRIBUTE_VALUE_REAL__DEFINITION:
-				if (resolve) return getDefinition();
-				return basicGetDefinition();
+		case ReqIF10Package.ATTRIBUTE_VALUE_REAL__THE_VALUE:
+			return getTheValue();
+		case ReqIF10Package.ATTRIBUTE_VALUE_REAL__DEFINITION:
+			if (resolve)
+				return getDefinition();
+			return basicGetDefinition();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_REAL__THE_VALUE:
-				setTheValue((Double)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_REAL__DEFINITION:
-				setDefinition((AttributeDefinitionReal)newValue);
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_REAL__THE_VALUE:
+			setTheValue((Double) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_REAL__DEFINITION:
+			setDefinition((AttributeDefinitionReal) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_REAL__THE_VALUE:
-				unsetTheValue();
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_REAL__DEFINITION:
-				unsetDefinition();
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_REAL__THE_VALUE:
+			unsetTheValue();
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_REAL__DEFINITION:
+			unsetDefinition();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_REAL__THE_VALUE:
-				return isSetTheValue();
-			case ReqIF10Package.ATTRIBUTE_VALUE_REAL__DEFINITION:
-				return isSetDefinition();
+		case ReqIF10Package.ATTRIBUTE_VALUE_REAL__THE_VALUE:
+			return isSetTheValue();
+		case ReqIF10Package.ATTRIBUTE_VALUE_REAL__DEFINITION:
+			return isSetDefinition();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (theValue: ");
-		if (theValueESet) result.append(theValue); else result.append("<unset>");
+		result.append(" (theValue: "); //$NON-NLS-1$
+		if (theValueESet)
+			result.append(theValue);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-} //AttributeValueRealImpl
+} // AttributeValueRealImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueSimpleImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueSimpleImpl.java
index 80f68fe..b9870a7 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueSimpleImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueSimpleImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,23 +12,21 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.rmf.reqif10.AttributeValueSimple;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Value Simple</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Value Simple</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class AttributeValueSimpleImpl extends AttributeValueImpl implements AttributeValueSimple {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeValueSimpleImpl() {
@@ -36,8 +34,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -45,4 +43,4 @@
 		return ReqIF10Package.Literals.ATTRIBUTE_VALUE_SIMPLE;
 	}
 
-} //AttributeValueSimpleImpl
+} // AttributeValueSimpleImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueStringImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueStringImpl.java
index ead80d3..ac3503d 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueStringImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueStringImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,35 +12,31 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.AttributeDefinitionString;
 import org.eclipse.rmf.reqif10.AttributeValueString;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Value String</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Value String</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueStringImpl#getTheValue <em>The Value</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueStringImpl#getDefinition <em>Definition</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueStringImpl#getTheValue <em>The Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueStringImpl#getDefinition <em>Definition</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AttributeValueStringImpl extends AttributeValueSimpleImpl implements AttributeValueString {
 	/**
-	 * The default value of the '{@link #getTheValue() <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTheValue() <em>The Value</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTheValue()
 	 * @generated
 	 * @ordered
@@ -48,9 +44,9 @@
 	protected static final String THE_VALUE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTheValue() <em>The Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTheValue() <em>The Value</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTheValue()
 	 * @generated
 	 * @ordered
@@ -58,18 +54,17 @@
 	protected String theValue = THE_VALUE_EDEFAULT;
 
 	/**
-	 * This is true if the The Value attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the The Value attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean theValueESet;
 
 	/**
-	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getDefinition()
 	 * @generated
 	 * @ordered
@@ -77,17 +72,16 @@
 	protected AttributeDefinitionString definition;
 
 	/**
-	 * This is true if the Definition reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Definition reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean definitionESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeValueStringImpl() {
@@ -95,8 +89,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -105,8 +99,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTheValue() {
@@ -114,8 +108,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTheValue(String newTheValue) {
@@ -124,12 +118,13 @@
 		boolean oldTheValueESet = theValueESet;
 		theValueESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_STRING__THE_VALUE, oldTheValue, theValue, !oldTheValueESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_STRING__THE_VALUE, oldTheValue, theValue,
+					!oldTheValueESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetTheValue() {
@@ -138,12 +133,13 @@
 		theValue = THE_VALUE_EDEFAULT;
 		theValueESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_STRING__THE_VALUE, oldTheValue, THE_VALUE_EDEFAULT, oldTheValueESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_STRING__THE_VALUE, oldTheValue,
+					THE_VALUE_EDEFAULT, oldTheValueESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetTheValue() {
@@ -151,25 +147,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionString getDefinition() {
 		if (definition != null && definition.eIsProxy()) {
-			InternalEObject oldDefinition = (InternalEObject)definition;
-			definition = (AttributeDefinitionString)eResolveProxy(oldDefinition);
+			InternalEObject oldDefinition = (InternalEObject) definition;
+			definition = (AttributeDefinitionString) eResolveProxy(oldDefinition);
 			if (definition != oldDefinition) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_VALUE_STRING__DEFINITION, oldDefinition, definition));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_VALUE_STRING__DEFINITION, oldDefinition,
+							definition));
 			}
 		}
 		return definition;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionString basicGetDefinition() {
@@ -177,8 +174,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefinition(AttributeDefinitionString newDefinition) {
@@ -187,12 +184,13 @@
 		boolean oldDefinitionESet = definitionESet;
 		definitionESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_STRING__DEFINITION, oldDefinition, definition, !oldDefinitionESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_STRING__DEFINITION, oldDefinition, definition,
+					!oldDefinitionESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDefinition() {
@@ -201,12 +199,13 @@
 		definition = null;
 		definitionESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_STRING__DEFINITION, oldDefinition, null, oldDefinitionESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_STRING__DEFINITION, oldDefinition, null,
+					oldDefinitionESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDefinition() {
@@ -214,88 +213,93 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_STRING__THE_VALUE:
-				return getTheValue();
-			case ReqIF10Package.ATTRIBUTE_VALUE_STRING__DEFINITION:
-				if (resolve) return getDefinition();
-				return basicGetDefinition();
+		case ReqIF10Package.ATTRIBUTE_VALUE_STRING__THE_VALUE:
+			return getTheValue();
+		case ReqIF10Package.ATTRIBUTE_VALUE_STRING__DEFINITION:
+			if (resolve)
+				return getDefinition();
+			return basicGetDefinition();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_STRING__THE_VALUE:
-				setTheValue((String)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_STRING__DEFINITION:
-				setDefinition((AttributeDefinitionString)newValue);
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_STRING__THE_VALUE:
+			setTheValue((String) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_STRING__DEFINITION:
+			setDefinition((AttributeDefinitionString) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_STRING__THE_VALUE:
-				unsetTheValue();
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_STRING__DEFINITION:
-				unsetDefinition();
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_STRING__THE_VALUE:
+			unsetTheValue();
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_STRING__DEFINITION:
+			unsetDefinition();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_STRING__THE_VALUE:
-				return isSetTheValue();
-			case ReqIF10Package.ATTRIBUTE_VALUE_STRING__DEFINITION:
-				return isSetDefinition();
+		case ReqIF10Package.ATTRIBUTE_VALUE_STRING__THE_VALUE:
+			return isSetTheValue();
+		case ReqIF10Package.ATTRIBUTE_VALUE_STRING__DEFINITION:
+			return isSetDefinition();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (theValue: ");
-		if (theValueESet) result.append(theValue); else result.append("<unset>");
+		result.append(" (theValue: "); //$NON-NLS-1$
+		if (theValueESet)
+			result.append(theValue);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-} //AttributeValueStringImpl
+} // AttributeValueStringImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueXHTMLImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueXHTMLImpl.java
index 3ffb408..cd24f27 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueXHTMLImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/AttributeValueXHTMLImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,38 +13,34 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.AttributeDefinitionXHTML;
 import org.eclipse.rmf.reqif10.AttributeValueXHTML;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.XhtmlContent;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Value XHTML</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Value XHTML</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueXHTMLImpl#isSimplified <em>Simplified</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueXHTMLImpl#getDefinition <em>Definition</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueXHTMLImpl#getTheOriginalValue <em>The Original Value</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueXHTMLImpl#getTheValue <em>The Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueXHTMLImpl#isSimplified <em>Simplified</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueXHTMLImpl#getDefinition <em>Definition</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueXHTMLImpl#getTheOriginalValue <em>The Original Value</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.AttributeValueXHTMLImpl#getTheValue <em>The Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AttributeValueXHTMLImpl extends AttributeValueImpl implements AttributeValueXHTML {
 	/**
-	 * The default value of the '{@link #isSimplified() <em>Simplified</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isSimplified() <em>Simplified</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isSimplified()
 	 * @generated
 	 * @ordered
@@ -52,9 +48,9 @@
 	protected static final boolean SIMPLIFIED_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isSimplified() <em>Simplified</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isSimplified() <em>Simplified</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isSimplified()
 	 * @generated
 	 * @ordered
@@ -62,18 +58,17 @@
 	protected boolean simplified = SIMPLIFIED_EDEFAULT;
 
 	/**
-	 * This is true if the Simplified attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Simplified attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean simplifiedESet;
 
 	/**
-	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getDefinition()
 	 * @generated
 	 * @ordered
@@ -81,18 +76,17 @@
 	protected AttributeDefinitionXHTML definition;
 
 	/**
-	 * This is true if the Definition reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Definition reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean definitionESet;
 
 	/**
-	 * The cached value of the '{@link #getTheOriginalValue() <em>The Original Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTheOriginalValue() <em>The Original Value</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTheOriginalValue()
 	 * @generated
 	 * @ordered
@@ -100,18 +94,18 @@
 	protected XhtmlContent theOriginalValue;
 
 	/**
-	 * This is true if the The Original Value containment reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the The Original Value containment reference has been set. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean theOriginalValueESet;
 
 	/**
-	 * The cached value of the '{@link #getTheValue() <em>The Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTheValue() <em>The Value</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTheValue()
 	 * @generated
 	 * @ordered
@@ -119,17 +113,16 @@
 	protected XhtmlContent theValue;
 
 	/**
-	 * This is true if the The Value containment reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the The Value containment reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean theValueESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AttributeValueXHTMLImpl() {
@@ -137,8 +130,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -147,8 +140,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSimplified() {
@@ -156,8 +149,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSimplified(boolean newSimplified) {
@@ -166,12 +159,13 @@
 		boolean oldSimplifiedESet = simplifiedESet;
 		simplifiedESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__SIMPLIFIED, oldSimplified, simplified, !oldSimplifiedESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__SIMPLIFIED, oldSimplified, simplified,
+					!oldSimplifiedESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSimplified() {
@@ -180,12 +174,13 @@
 		simplified = SIMPLIFIED_EDEFAULT;
 		simplifiedESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__SIMPLIFIED, oldSimplified, SIMPLIFIED_EDEFAULT, oldSimplifiedESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__SIMPLIFIED, oldSimplified,
+					SIMPLIFIED_EDEFAULT, oldSimplifiedESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSimplified() {
@@ -193,25 +188,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionXHTML getDefinition() {
 		if (definition != null && definition.eIsProxy()) {
-			InternalEObject oldDefinition = (InternalEObject)definition;
-			definition = (AttributeDefinitionXHTML)eResolveProxy(oldDefinition);
+			InternalEObject oldDefinition = (InternalEObject) definition;
+			definition = (AttributeDefinitionXHTML) eResolveProxy(oldDefinition);
 			if (definition != oldDefinition) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__DEFINITION, oldDefinition, definition));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__DEFINITION, oldDefinition,
+							definition));
 			}
 		}
 		return definition;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AttributeDefinitionXHTML basicGetDefinition() {
@@ -219,8 +215,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefinition(AttributeDefinitionXHTML newDefinition) {
@@ -229,12 +225,13 @@
 		boolean oldDefinitionESet = definitionESet;
 		definitionESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__DEFINITION, oldDefinition, definition, !oldDefinitionESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__DEFINITION, oldDefinition, definition,
+					!oldDefinitionESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDefinition() {
@@ -243,12 +240,13 @@
 		definition = null;
 		definitionESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__DEFINITION, oldDefinition, null, oldDefinitionESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__DEFINITION, oldDefinition, null,
+					oldDefinitionESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDefinition() {
@@ -256,8 +254,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlContent getTheOriginalValue() {
@@ -265,8 +263,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTheOriginalValue(XhtmlContent newTheOriginalValue, NotificationChain msgs) {
@@ -275,38 +273,45 @@
 		boolean oldTheOriginalValueESet = theOriginalValueESet;
 		theOriginalValueESet = true;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE, oldTheOriginalValue, newTheOriginalValue, !oldTheOriginalValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE,
+					oldTheOriginalValue, newTheOriginalValue, !oldTheOriginalValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTheOriginalValue(XhtmlContent newTheOriginalValue) {
 		if (newTheOriginalValue != theOriginalValue) {
 			NotificationChain msgs = null;
 			if (theOriginalValue != null)
-				msgs = ((InternalEObject)theOriginalValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE, null, msgs);
+				msgs = ((InternalEObject) theOriginalValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE, null, msgs);
 			if (newTheOriginalValue != null)
-				msgs = ((InternalEObject)newTheOriginalValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE, null, msgs);
+				msgs = ((InternalEObject) newTheOriginalValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE, null, msgs);
 			msgs = basicSetTheOriginalValue(newTheOriginalValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldTheOriginalValueESet = theOriginalValueESet;
 			theOriginalValueESet = true;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE, newTheOriginalValue, newTheOriginalValue, !oldTheOriginalValueESet));
+				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE, newTheOriginalValue,
+						newTheOriginalValue, !oldTheOriginalValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetTheOriginalValue(NotificationChain msgs) {
@@ -315,35 +320,41 @@
 		boolean oldTheOriginalValueESet = theOriginalValueESet;
 		theOriginalValueESet = false;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE, oldTheOriginalValue, null, oldTheOriginalValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET,
+					ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE, oldTheOriginalValue, null, oldTheOriginalValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetTheOriginalValue() {
 		if (theOriginalValue != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject)theOriginalValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE, null, msgs);
+			msgs = ((InternalEObject) theOriginalValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+					- ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE, null, msgs);
 			msgs = basicUnsetTheOriginalValue(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldTheOriginalValueESet = theOriginalValueESet;
 			theOriginalValueESet = false;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE, null, null, oldTheOriginalValueESet));
+				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE, null, null,
+						oldTheOriginalValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetTheOriginalValue() {
@@ -351,8 +362,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public XhtmlContent getTheValue() {
@@ -360,8 +371,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTheValue(XhtmlContent newTheValue, NotificationChain msgs) {
@@ -370,38 +381,45 @@
 		boolean oldTheValueESet = theValueESet;
 		theValueESet = true;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE, oldTheValue, newTheValue, !oldTheValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE,
+					oldTheValue, newTheValue, !oldTheValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTheValue(XhtmlContent newTheValue) {
 		if (newTheValue != theValue) {
 			NotificationChain msgs = null;
 			if (theValue != null)
-				msgs = ((InternalEObject)theValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE, null, msgs);
+				msgs = ((InternalEObject) theValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE,
+						null, msgs);
 			if (newTheValue != null)
-				msgs = ((InternalEObject)newTheValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE, null, msgs);
+				msgs = ((InternalEObject) newTheValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE,
+						null, msgs);
 			msgs = basicSetTheValue(newTheValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldTheValueESet = theValueESet;
 			theValueESet = true;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE, newTheValue, newTheValue, !oldTheValueESet));
+				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE, newTheValue, newTheValue,
+						!oldTheValueESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetTheValue(NotificationChain msgs) {
@@ -410,25 +428,30 @@
 		boolean oldTheValueESet = theValueESet;
 		theValueESet = false;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE, oldTheValue, null, oldTheValueESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE,
+					oldTheValue, null, oldTheValueESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetTheValue() {
 		if (theValue != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject)theValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE, null, msgs);
+			msgs = ((InternalEObject) theValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE, null,
+					msgs);
 			msgs = basicUnsetTheValue(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldTheValueESet = theValueESet;
 			theValueESet = false;
 			if (eNotificationRequired())
@@ -437,8 +460,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetTheValue() {
@@ -446,124 +469,129 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE:
-				return basicUnsetTheOriginalValue(msgs);
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE:
-				return basicUnsetTheValue(msgs);
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE:
+			return basicUnsetTheOriginalValue(msgs);
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE:
+			return basicUnsetTheValue(msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__SIMPLIFIED:
-				return isSimplified();
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__DEFINITION:
-				if (resolve) return getDefinition();
-				return basicGetDefinition();
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE:
-				return getTheOriginalValue();
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE:
-				return getTheValue();
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__SIMPLIFIED:
+			return isSimplified();
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__DEFINITION:
+			if (resolve)
+				return getDefinition();
+			return basicGetDefinition();
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE:
+			return getTheOriginalValue();
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE:
+			return getTheValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__SIMPLIFIED:
-				setSimplified((Boolean)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__DEFINITION:
-				setDefinition((AttributeDefinitionXHTML)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE:
-				setTheOriginalValue((XhtmlContent)newValue);
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE:
-				setTheValue((XhtmlContent)newValue);
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__SIMPLIFIED:
+			setSimplified((Boolean) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__DEFINITION:
+			setDefinition((AttributeDefinitionXHTML) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE:
+			setTheOriginalValue((XhtmlContent) newValue);
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE:
+			setTheValue((XhtmlContent) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__SIMPLIFIED:
-				unsetSimplified();
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__DEFINITION:
-				unsetDefinition();
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE:
-				unsetTheOriginalValue();
-				return;
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE:
-				unsetTheValue();
-				return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__SIMPLIFIED:
+			unsetSimplified();
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__DEFINITION:
+			unsetDefinition();
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE:
+			unsetTheOriginalValue();
+			return;
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE:
+			unsetTheValue();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__SIMPLIFIED:
-				return isSetSimplified();
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__DEFINITION:
-				return isSetDefinition();
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE:
-				return isSetTheOriginalValue();
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE:
-				return isSetTheValue();
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__SIMPLIFIED:
+			return isSetSimplified();
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__DEFINITION:
+			return isSetDefinition();
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_ORIGINAL_VALUE:
+			return isSetTheOriginalValue();
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML__THE_VALUE:
+			return isSetTheValue();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (simplified: ");
-		if (simplifiedESet) result.append(simplified); else result.append("<unset>");
+		result.append(" (simplified: "); //$NON-NLS-1$
+		if (simplifiedESet)
+			result.append(simplified);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-} //AttributeValueXHTMLImpl
+} // AttributeValueXHTMLImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionBooleanImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionBooleanImpl.java
index 5122bb1..91a8ed6 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionBooleanImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionBooleanImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,23 +12,21 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Datatype Definition Boolean</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Datatype Definition Boolean</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class DatatypeDefinitionBooleanImpl extends DatatypeDefinitionSimpleImpl implements DatatypeDefinitionBoolean {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypeDefinitionBooleanImpl() {
@@ -36,8 +34,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -45,4 +43,4 @@
 		return ReqIF10Package.Literals.DATATYPE_DEFINITION_BOOLEAN;
 	}
 
-} //DatatypeDefinitionBooleanImpl
+} // DatatypeDefinitionBooleanImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionDateImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionDateImpl.java
index 55114ef..cbecc29 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionDateImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionDateImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,23 +12,21 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.rmf.reqif10.DatatypeDefinitionDate;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Datatype Definition Date</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Datatype Definition Date</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class DatatypeDefinitionDateImpl extends DatatypeDefinitionSimpleImpl implements DatatypeDefinitionDate {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypeDefinitionDateImpl() {
@@ -36,8 +34,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -45,4 +43,4 @@
 		return ReqIF10Package.Literals.DATATYPE_DEFINITION_DATE;
 	}
 
-} //DatatypeDefinitionDateImpl
+} // DatatypeDefinitionDateImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionEnumerationImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionEnumerationImpl.java
index 475caef..ad84b1b 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionEnumerationImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionEnumerationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,37 +14,33 @@
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration;
 import org.eclipse.rmf.reqif10.EnumValue;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Datatype Definition Enumeration</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Datatype Definition Enumeration</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionEnumerationImpl#getSpecifiedValues <em>Specified Values</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionEnumerationImpl#getSpecifiedValues <em>Specified Values
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class DatatypeDefinitionEnumerationImpl extends DatatypeDefinitionImpl implements DatatypeDefinitionEnumeration {
 	/**
 	 * The cached value of the '{@link #getSpecifiedValues() <em>Specified Values</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSpecifiedValues()
 	 * @generated
 	 * @ordered
@@ -52,8 +48,8 @@
 	protected EList<EnumValue> specifiedValues;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypeDefinitionEnumerationImpl() {
@@ -61,8 +57,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -71,107 +67,109 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<EnumValue> getSpecifiedValues() {
 		if (specifiedValues == null) {
-			specifiedValues = new EObjectContainmentEList.Unsettable<EnumValue>(EnumValue.class, this, ReqIF10Package.DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES);
+			specifiedValues = new EObjectContainmentEList.Unsettable<EnumValue>(EnumValue.class, this,
+					ReqIF10Package.DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES);
 		}
 		return specifiedValues;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpecifiedValues() {
-		if (specifiedValues != null) ((InternalEList.Unsettable<?>)specifiedValues).unset();
+		if (specifiedValues != null)
+			((InternalEList.Unsettable<?>) specifiedValues).unset();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpecifiedValues() {
-		return specifiedValues != null && ((InternalEList.Unsettable<?>)specifiedValues).isSet();
+		return specifiedValues != null && ((InternalEList.Unsettable<?>) specifiedValues).isSet();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES:
-				return ((InternalEList<?>)getSpecifiedValues()).basicRemove(otherEnd, msgs);
+		case ReqIF10Package.DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES:
+			return ((InternalEList<?>) getSpecifiedValues()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES:
-				return getSpecifiedValues();
+		case ReqIF10Package.DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES:
+			return getSpecifiedValues();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES:
-				getSpecifiedValues().clear();
-				getSpecifiedValues().addAll((Collection<? extends EnumValue>)newValue);
-				return;
+		case ReqIF10Package.DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES:
+			getSpecifiedValues().clear();
+			getSpecifiedValues().addAll((Collection<? extends EnumValue>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES:
-				unsetSpecifiedValues();
-				return;
+		case ReqIF10Package.DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES:
+			unsetSpecifiedValues();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES:
-				return isSetSpecifiedValues();
+		case ReqIF10Package.DATATYPE_DEFINITION_ENUMERATION__SPECIFIED_VALUES:
+			return isSetSpecifiedValues();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //DatatypeDefinitionEnumerationImpl
+} // DatatypeDefinitionEnumerationImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionImpl.java
index f331d82..cf1410f 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,23 +12,21 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.rmf.reqif10.DatatypeDefinition;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Datatype Definition</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Datatype Definition</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class DatatypeDefinitionImpl extends IdentifiableImpl implements DatatypeDefinition {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypeDefinitionImpl() {
@@ -36,8 +34,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -45,4 +43,4 @@
 		return ReqIF10Package.Literals.DATATYPE_DEFINITION;
 	}
 
-} //DatatypeDefinitionImpl
+} // DatatypeDefinitionImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionIntegerImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionIntegerImpl.java
index 9f670a2..06fe0c2 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionIntegerImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionIntegerImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,33 +14,29 @@
 import java.math.BigInteger;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.DatatypeDefinitionInteger;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Datatype Definition Integer</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Datatype Definition Integer</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionIntegerImpl#getMax <em>Max</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionIntegerImpl#getMin <em>Min</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionIntegerImpl#getMax <em>Max</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionIntegerImpl#getMin <em>Min</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class DatatypeDefinitionIntegerImpl extends DatatypeDefinitionSimpleImpl implements DatatypeDefinitionInteger {
 	/**
-	 * The default value of the '{@link #getMax() <em>Max</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMax() <em>Max</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getMax()
 	 * @generated
 	 * @ordered
@@ -48,9 +44,8 @@
 	protected static final BigInteger MAX_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getMax() <em>Max</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMax() <em>Max</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMax()
 	 * @generated
 	 * @ordered
@@ -58,18 +53,17 @@
 	protected BigInteger max = MAX_EDEFAULT;
 
 	/**
-	 * This is true if the Max attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Max attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean maxESet;
 
 	/**
-	 * The default value of the '{@link #getMin() <em>Min</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMin() <em>Min</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getMin()
 	 * @generated
 	 * @ordered
@@ -77,9 +71,8 @@
 	protected static final BigInteger MIN_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getMin() <em>Min</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMin() <em>Min</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMin()
 	 * @generated
 	 * @ordered
@@ -87,17 +80,16 @@
 	protected BigInteger min = MIN_EDEFAULT;
 
 	/**
-	 * This is true if the Min attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Min attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean minESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypeDefinitionIntegerImpl() {
@@ -105,8 +97,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -115,8 +107,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger getMax() {
@@ -124,8 +116,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMax(BigInteger newMax) {
@@ -138,8 +130,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetMax() {
@@ -152,8 +144,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetMax() {
@@ -161,8 +153,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger getMin() {
@@ -170,8 +162,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMin(BigInteger newMin) {
@@ -184,8 +176,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetMin() {
@@ -198,8 +190,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetMin() {
@@ -207,89 +199,96 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MAX:
-				return getMax();
-			case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MIN:
-				return getMin();
+		case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MAX:
+			return getMax();
+		case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MIN:
+			return getMin();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MAX:
-				setMax((BigInteger)newValue);
-				return;
-			case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MIN:
-				setMin((BigInteger)newValue);
-				return;
+		case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MAX:
+			setMax((BigInteger) newValue);
+			return;
+		case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MIN:
+			setMin((BigInteger) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MAX:
-				unsetMax();
-				return;
-			case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MIN:
-				unsetMin();
-				return;
+		case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MAX:
+			unsetMax();
+			return;
+		case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MIN:
+			unsetMin();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MAX:
-				return isSetMax();
-			case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MIN:
-				return isSetMin();
+		case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MAX:
+			return isSetMax();
+		case ReqIF10Package.DATATYPE_DEFINITION_INTEGER__MIN:
+			return isSetMin();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (max: ");
-		if (maxESet) result.append(max); else result.append("<unset>");
-		result.append(", min: ");
-		if (minESet) result.append(min); else result.append("<unset>");
+		result.append(" (max: "); //$NON-NLS-1$
+		if (maxESet)
+			result.append(max);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", min: "); //$NON-NLS-1$
+		if (minESet)
+			result.append(min);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-} //DatatypeDefinitionIntegerImpl
+} // DatatypeDefinitionIntegerImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionRealImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionRealImpl.java
index d67ab50..ed96179 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionRealImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionRealImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,34 +14,30 @@
 import java.math.BigInteger;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.DatatypeDefinitionReal;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Datatype Definition Real</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Datatype Definition Real</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionRealImpl#getAccuracy <em>Accuracy</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionRealImpl#getMax <em>Max</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionRealImpl#getMin <em>Min</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionRealImpl#getAccuracy <em>Accuracy</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionRealImpl#getMax <em>Max</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionRealImpl#getMin <em>Min</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class DatatypeDefinitionRealImpl extends DatatypeDefinitionSimpleImpl implements DatatypeDefinitionReal {
 	/**
-	 * The default value of the '{@link #getAccuracy() <em>Accuracy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAccuracy() <em>Accuracy</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAccuracy()
 	 * @generated
 	 * @ordered
@@ -49,9 +45,9 @@
 	protected static final BigInteger ACCURACY_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getAccuracy() <em>Accuracy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAccuracy() <em>Accuracy</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAccuracy()
 	 * @generated
 	 * @ordered
@@ -59,18 +55,17 @@
 	protected BigInteger accuracy = ACCURACY_EDEFAULT;
 
 	/**
-	 * This is true if the Accuracy attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Accuracy attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean accuracyESet;
 
 	/**
-	 * The default value of the '{@link #getMax() <em>Max</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMax() <em>Max</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getMax()
 	 * @generated
 	 * @ordered
@@ -78,9 +73,8 @@
 	protected static final double MAX_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getMax() <em>Max</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMax() <em>Max</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMax()
 	 * @generated
 	 * @ordered
@@ -88,18 +82,17 @@
 	protected double max = MAX_EDEFAULT;
 
 	/**
-	 * This is true if the Max attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Max attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean maxESet;
 
 	/**
-	 * The default value of the '{@link #getMin() <em>Min</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMin() <em>Min</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getMin()
 	 * @generated
 	 * @ordered
@@ -107,9 +100,8 @@
 	protected static final double MIN_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getMin() <em>Min</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMin() <em>Min</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMin()
 	 * @generated
 	 * @ordered
@@ -117,17 +109,16 @@
 	protected double min = MIN_EDEFAULT;
 
 	/**
-	 * This is true if the Min attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Min attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean minESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypeDefinitionRealImpl() {
@@ -135,8 +126,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -145,8 +136,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger getAccuracy() {
@@ -154,8 +145,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAccuracy(BigInteger newAccuracy) {
@@ -164,12 +155,13 @@
 		boolean oldAccuracyESet = accuracyESet;
 		accuracyESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.DATATYPE_DEFINITION_REAL__ACCURACY, oldAccuracy, accuracy, !oldAccuracyESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.DATATYPE_DEFINITION_REAL__ACCURACY, oldAccuracy, accuracy,
+					!oldAccuracyESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetAccuracy() {
@@ -178,12 +170,13 @@
 		accuracy = ACCURACY_EDEFAULT;
 		accuracyESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.DATATYPE_DEFINITION_REAL__ACCURACY, oldAccuracy, ACCURACY_EDEFAULT, oldAccuracyESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.DATATYPE_DEFINITION_REAL__ACCURACY, oldAccuracy,
+					ACCURACY_EDEFAULT, oldAccuracyESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetAccuracy() {
@@ -191,8 +184,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getMax() {
@@ -200,8 +193,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMax(double newMax) {
@@ -214,8 +207,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetMax() {
@@ -228,8 +221,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetMax() {
@@ -237,8 +230,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getMin() {
@@ -246,8 +239,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMin(double newMin) {
@@ -260,8 +253,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetMin() {
@@ -274,8 +267,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetMin() {
@@ -283,101 +276,111 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_REAL__ACCURACY:
-				return getAccuracy();
-			case ReqIF10Package.DATATYPE_DEFINITION_REAL__MAX:
-				return getMax();
-			case ReqIF10Package.DATATYPE_DEFINITION_REAL__MIN:
-				return getMin();
+		case ReqIF10Package.DATATYPE_DEFINITION_REAL__ACCURACY:
+			return getAccuracy();
+		case ReqIF10Package.DATATYPE_DEFINITION_REAL__MAX:
+			return getMax();
+		case ReqIF10Package.DATATYPE_DEFINITION_REAL__MIN:
+			return getMin();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_REAL__ACCURACY:
-				setAccuracy((BigInteger)newValue);
-				return;
-			case ReqIF10Package.DATATYPE_DEFINITION_REAL__MAX:
-				setMax((Double)newValue);
-				return;
-			case ReqIF10Package.DATATYPE_DEFINITION_REAL__MIN:
-				setMin((Double)newValue);
-				return;
+		case ReqIF10Package.DATATYPE_DEFINITION_REAL__ACCURACY:
+			setAccuracy((BigInteger) newValue);
+			return;
+		case ReqIF10Package.DATATYPE_DEFINITION_REAL__MAX:
+			setMax((Double) newValue);
+			return;
+		case ReqIF10Package.DATATYPE_DEFINITION_REAL__MIN:
+			setMin((Double) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_REAL__ACCURACY:
-				unsetAccuracy();
-				return;
-			case ReqIF10Package.DATATYPE_DEFINITION_REAL__MAX:
-				unsetMax();
-				return;
-			case ReqIF10Package.DATATYPE_DEFINITION_REAL__MIN:
-				unsetMin();
-				return;
+		case ReqIF10Package.DATATYPE_DEFINITION_REAL__ACCURACY:
+			unsetAccuracy();
+			return;
+		case ReqIF10Package.DATATYPE_DEFINITION_REAL__MAX:
+			unsetMax();
+			return;
+		case ReqIF10Package.DATATYPE_DEFINITION_REAL__MIN:
+			unsetMin();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_REAL__ACCURACY:
-				return isSetAccuracy();
-			case ReqIF10Package.DATATYPE_DEFINITION_REAL__MAX:
-				return isSetMax();
-			case ReqIF10Package.DATATYPE_DEFINITION_REAL__MIN:
-				return isSetMin();
+		case ReqIF10Package.DATATYPE_DEFINITION_REAL__ACCURACY:
+			return isSetAccuracy();
+		case ReqIF10Package.DATATYPE_DEFINITION_REAL__MAX:
+			return isSetMax();
+		case ReqIF10Package.DATATYPE_DEFINITION_REAL__MIN:
+			return isSetMin();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (accuracy: ");
-		if (accuracyESet) result.append(accuracy); else result.append("<unset>");
-		result.append(", max: ");
-		if (maxESet) result.append(max); else result.append("<unset>");
-		result.append(", min: ");
-		if (minESet) result.append(min); else result.append("<unset>");
+		result.append(" (accuracy: "); //$NON-NLS-1$
+		if (accuracyESet)
+			result.append(accuracy);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", max: "); //$NON-NLS-1$
+		if (maxESet)
+			result.append(max);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
+		result.append(", min: "); //$NON-NLS-1$
+		if (minESet)
+			result.append(min);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-} //DatatypeDefinitionRealImpl
+} // DatatypeDefinitionRealImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionSimpleImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionSimpleImpl.java
index b299753..4496734 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionSimpleImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionSimpleImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,23 +12,21 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.rmf.reqif10.DatatypeDefinitionSimple;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Datatype Definition Simple</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Datatype Definition Simple</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class DatatypeDefinitionSimpleImpl extends DatatypeDefinitionImpl implements DatatypeDefinitionSimple {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypeDefinitionSimpleImpl() {
@@ -36,8 +34,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -45,4 +43,4 @@
 		return ReqIF10Package.Literals.DATATYPE_DEFINITION_SIMPLE;
 	}
 
-} //DatatypeDefinitionSimpleImpl
+} // DatatypeDefinitionSimpleImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionStringImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionStringImpl.java
index d74ac83..d834418 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionStringImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionStringImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,32 +14,28 @@
 import java.math.BigInteger;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.DatatypeDefinitionString;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Datatype Definition String</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Datatype Definition String</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionStringImpl#getMaxLength <em>Max Length</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.DatatypeDefinitionStringImpl#getMaxLength <em>Max Length</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class DatatypeDefinitionStringImpl extends DatatypeDefinitionSimpleImpl implements DatatypeDefinitionString {
 	/**
-	 * The default value of the '{@link #getMaxLength() <em>Max Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMaxLength() <em>Max Length</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMaxLength()
 	 * @generated
 	 * @ordered
@@ -47,9 +43,9 @@
 	protected static final BigInteger MAX_LENGTH_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getMaxLength() <em>Max Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMaxLength() <em>Max Length</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMaxLength()
 	 * @generated
 	 * @ordered
@@ -57,17 +53,16 @@
 	protected BigInteger maxLength = MAX_LENGTH_EDEFAULT;
 
 	/**
-	 * This is true if the Max Length attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Max Length attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean maxLengthESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypeDefinitionStringImpl() {
@@ -75,8 +70,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -85,8 +80,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger getMaxLength() {
@@ -94,8 +89,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMaxLength(BigInteger newMaxLength) {
@@ -104,12 +99,13 @@
 		boolean oldMaxLengthESet = maxLengthESet;
 		maxLengthESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.DATATYPE_DEFINITION_STRING__MAX_LENGTH, oldMaxLength, maxLength, !oldMaxLengthESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.DATATYPE_DEFINITION_STRING__MAX_LENGTH, oldMaxLength, maxLength,
+					!oldMaxLengthESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetMaxLength() {
@@ -118,12 +114,13 @@
 		maxLength = MAX_LENGTH_EDEFAULT;
 		maxLengthESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.DATATYPE_DEFINITION_STRING__MAX_LENGTH, oldMaxLength, MAX_LENGTH_EDEFAULT, oldMaxLengthESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.DATATYPE_DEFINITION_STRING__MAX_LENGTH, oldMaxLength,
+					MAX_LENGTH_EDEFAULT, oldMaxLengthESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetMaxLength() {
@@ -131,77 +128,81 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_STRING__MAX_LENGTH:
-				return getMaxLength();
+		case ReqIF10Package.DATATYPE_DEFINITION_STRING__MAX_LENGTH:
+			return getMaxLength();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_STRING__MAX_LENGTH:
-				setMaxLength((BigInteger)newValue);
-				return;
+		case ReqIF10Package.DATATYPE_DEFINITION_STRING__MAX_LENGTH:
+			setMaxLength((BigInteger) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_STRING__MAX_LENGTH:
-				unsetMaxLength();
-				return;
+		case ReqIF10Package.DATATYPE_DEFINITION_STRING__MAX_LENGTH:
+			unsetMaxLength();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.DATATYPE_DEFINITION_STRING__MAX_LENGTH:
-				return isSetMaxLength();
+		case ReqIF10Package.DATATYPE_DEFINITION_STRING__MAX_LENGTH:
+			return isSetMaxLength();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (maxLength: ");
-		if (maxLengthESet) result.append(maxLength); else result.append("<unset>");
+		result.append(" (maxLength: "); //$NON-NLS-1$
+		if (maxLengthESet)
+			result.append(maxLength);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-} //DatatypeDefinitionStringImpl
+} // DatatypeDefinitionStringImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionXHTMLImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionXHTMLImpl.java
index 58b58e7..3630f20 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionXHTMLImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/DatatypeDefinitionXHTMLImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,23 +12,21 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Datatype Definition XHTML</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Datatype Definition XHTML</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class DatatypeDefinitionXHTMLImpl extends DatatypeDefinitionImpl implements DatatypeDefinitionXHTML {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypeDefinitionXHTMLImpl() {
@@ -36,8 +34,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -45,4 +43,4 @@
 		return ReqIF10Package.Literals.DATATYPE_DEFINITION_XHTML;
 	}
 
-} //DatatypeDefinitionXHTMLImpl
+} // DatatypeDefinitionXHTMLImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/EmbeddedValueImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/EmbeddedValueImpl.java
index 59a121f..83ca6e7 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/EmbeddedValueImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/EmbeddedValueImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,34 +14,29 @@
 import java.math.BigInteger;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.rmf.reqif10.EmbeddedValue;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Embedded Value</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Embedded Value</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.EmbeddedValueImpl#getKey <em>Key</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.EmbeddedValueImpl#getOtherContent <em>Other Content</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.EmbeddedValueImpl#getKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.EmbeddedValueImpl#getOtherContent <em>Other Content</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class EmbeddedValueImpl extends EObjectImpl implements EmbeddedValue {
+public class EmbeddedValueImpl extends MinimalEObjectImpl implements EmbeddedValue {
 	/**
-	 * The default value of the '{@link #getKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getKey()
 	 * @generated
 	 * @ordered
@@ -49,9 +44,8 @@
 	protected static final BigInteger KEY_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getKey()
 	 * @generated
 	 * @ordered
@@ -59,18 +53,17 @@
 	protected BigInteger key = KEY_EDEFAULT;
 
 	/**
-	 * This is true if the Key attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Key attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean keyESet;
 
 	/**
-	 * The default value of the '{@link #getOtherContent() <em>Other Content</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getOtherContent() <em>Other Content</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getOtherContent()
 	 * @generated
 	 * @ordered
@@ -78,9 +71,9 @@
 	protected static final String OTHER_CONTENT_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getOtherContent() <em>Other Content</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getOtherContent() <em>Other Content</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getOtherContent()
 	 * @generated
 	 * @ordered
@@ -88,17 +81,16 @@
 	protected String otherContent = OTHER_CONTENT_EDEFAULT;
 
 	/**
-	 * This is true if the Other Content attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Other Content attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean otherContentESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EmbeddedValueImpl() {
@@ -106,8 +98,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -116,8 +108,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BigInteger getKey() {
@@ -125,8 +117,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setKey(BigInteger newKey) {
@@ -134,13 +126,14 @@
 		key = newKey;
 		boolean oldKeyESet = keyESet;
 		keyESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.EMBEDDED_VALUE__KEY, oldKey, key, !oldKeyESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetKey() {
@@ -148,13 +141,14 @@
 		boolean oldKeyESet = keyESet;
 		key = KEY_EDEFAULT;
 		keyESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.EMBEDDED_VALUE__KEY, oldKey, KEY_EDEFAULT, oldKeyESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetKey() {
@@ -162,8 +156,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getOtherContent() {
@@ -171,8 +165,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setOtherContent(String newOtherContent) {
@@ -180,13 +174,15 @@
 		otherContent = newOtherContent;
 		boolean oldOtherContentESet = otherContentESet;
 		otherContentESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.EMBEDDED_VALUE__OTHER_CONTENT, oldOtherContent, otherContent, !oldOtherContentESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.EMBEDDED_VALUE__OTHER_CONTENT, oldOtherContent, otherContent,
+					!oldOtherContentESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetOtherContent() {
@@ -194,13 +190,15 @@
 		boolean oldOtherContentESet = otherContentESet;
 		otherContent = OTHER_CONTENT_EDEFAULT;
 		otherContentESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.EMBEDDED_VALUE__OTHER_CONTENT, oldOtherContent, OTHER_CONTENT_EDEFAULT, oldOtherContentESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.EMBEDDED_VALUE__OTHER_CONTENT, oldOtherContent,
+					OTHER_CONTENT_EDEFAULT, oldOtherContentESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetOtherContent() {
@@ -208,89 +206,99 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.EMBEDDED_VALUE__KEY:
-				return getKey();
-			case ReqIF10Package.EMBEDDED_VALUE__OTHER_CONTENT:
-				return getOtherContent();
+		case ReqIF10Package.EMBEDDED_VALUE__KEY:
+			return getKey();
+		case ReqIF10Package.EMBEDDED_VALUE__OTHER_CONTENT:
+			return getOtherContent();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.EMBEDDED_VALUE__KEY:
-				setKey((BigInteger)newValue);
-				return;
-			case ReqIF10Package.EMBEDDED_VALUE__OTHER_CONTENT:
-				setOtherContent((String)newValue);
-				return;
+		case ReqIF10Package.EMBEDDED_VALUE__KEY:
+			setKey((BigInteger) newValue);
+			return;
+		case ReqIF10Package.EMBEDDED_VALUE__OTHER_CONTENT:
+			setOtherContent((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.EMBEDDED_VALUE__KEY:
-				unsetKey();
-				return;
-			case ReqIF10Package.EMBEDDED_VALUE__OTHER_CONTENT:
-				unsetOtherContent();
-				return;
+		case ReqIF10Package.EMBEDDED_VALUE__KEY:
+			unsetKey();
+			return;
+		case ReqIF10Package.EMBEDDED_VALUE__OTHER_CONTENT:
+			unsetOtherContent();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.EMBEDDED_VALUE__KEY:
-				return isSetKey();
-			case ReqIF10Package.EMBEDDED_VALUE__OTHER_CONTENT:
-				return isSetOtherContent();
+		case ReqIF10Package.EMBEDDED_VALUE__KEY:
+			return isSetKey();
+		case ReqIF10Package.EMBEDDED_VALUE__OTHER_CONTENT:
+			return isSetOtherContent();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy()) {
+			return super.toString();
+		}
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (key: ");
-		if (keyESet) result.append(key); else result.append("<unset>");
-		result.append(", otherContent: ");
-		if (otherContentESet) result.append(otherContent); else result.append("<unset>");
+		result.append(" (key: "); //$NON-NLS-1$
+		if (keyESet) {
+			result.append(key);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", otherContent: "); //$NON-NLS-1$
+		if (otherContentESet) {
+			result.append(otherContent);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
 		result.append(')');
 		return result.toString();
 	}
 
-} //EmbeddedValueImpl
+} // EmbeddedValueImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/EnumValueImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/EnumValueImpl.java
index eef218e..f87f090 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/EnumValueImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/EnumValueImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,34 +13,29 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.EmbeddedValue;
 import org.eclipse.rmf.reqif10.EnumValue;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Enum Value</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Enum Value</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.EnumValueImpl#getProperties <em>Properties</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.EnumValueImpl#getProperties <em>Properties</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class EnumValueImpl extends IdentifiableImpl implements EnumValue {
 	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getProperties()
 	 * @generated
 	 * @ordered
@@ -48,17 +43,16 @@
 	protected EmbeddedValue properties;
 
 	/**
-	 * This is true if the Properties containment reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Properties containment reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean propertiesESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EnumValueImpl() {
@@ -66,8 +60,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,8 +70,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EmbeddedValue getProperties() {
@@ -85,8 +79,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetProperties(EmbeddedValue newProperties, NotificationChain msgs) {
@@ -95,38 +89,45 @@
 		boolean oldPropertiesESet = propertiesESet;
 		propertiesESet = true;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ENUM_VALUE__PROPERTIES, oldProperties, newProperties, !oldPropertiesESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.ENUM_VALUE__PROPERTIES, oldProperties,
+					newProperties, !oldPropertiesESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setProperties(EmbeddedValue newProperties) {
 		if (newProperties != properties) {
 			NotificationChain msgs = null;
 			if (properties != null)
-				msgs = ((InternalEObject)properties).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ENUM_VALUE__PROPERTIES, null, msgs);
+				msgs = ((InternalEObject) properties)
+						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ENUM_VALUE__PROPERTIES, null, msgs);
 			if (newProperties != null)
-				msgs = ((InternalEObject)newProperties).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ENUM_VALUE__PROPERTIES, null, msgs);
+				msgs = ((InternalEObject) newProperties)
+						.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ENUM_VALUE__PROPERTIES, null, msgs);
 			msgs = basicSetProperties(newProperties, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldPropertiesESet = propertiesESet;
 			propertiesESet = true;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ENUM_VALUE__PROPERTIES, newProperties, newProperties, !oldPropertiesESet));
+				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.ENUM_VALUE__PROPERTIES, newProperties, newProperties,
+						!oldPropertiesESet));
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetProperties(NotificationChain msgs) {
@@ -135,25 +136,29 @@
 		boolean oldPropertiesESet = propertiesESet;
 		propertiesESet = false;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ENUM_VALUE__PROPERTIES, oldProperties, null, oldPropertiesESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.ENUM_VALUE__PROPERTIES, oldProperties,
+					null, oldPropertiesESet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetProperties() {
 		if (properties != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject)properties).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ENUM_VALUE__PROPERTIES, null, msgs);
+			msgs = ((InternalEObject) properties).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.ENUM_VALUE__PROPERTIES, null, msgs);
 			msgs = basicUnsetProperties(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldPropertiesESet = propertiesESet;
 			propertiesESet = false;
 			if (eNotificationRequired())
@@ -162,8 +167,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetProperties() {
@@ -171,75 +176,75 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.ENUM_VALUE__PROPERTIES:
-				return basicUnsetProperties(msgs);
+		case ReqIF10Package.ENUM_VALUE__PROPERTIES:
+			return basicUnsetProperties(msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.ENUM_VALUE__PROPERTIES:
-				return getProperties();
+		case ReqIF10Package.ENUM_VALUE__PROPERTIES:
+			return getProperties();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.ENUM_VALUE__PROPERTIES:
-				setProperties((EmbeddedValue)newValue);
-				return;
+		case ReqIF10Package.ENUM_VALUE__PROPERTIES:
+			setProperties((EmbeddedValue) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ENUM_VALUE__PROPERTIES:
-				unsetProperties();
-				return;
+		case ReqIF10Package.ENUM_VALUE__PROPERTIES:
+			unsetProperties();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.ENUM_VALUE__PROPERTIES:
-				return isSetProperties();
+		case ReqIF10Package.ENUM_VALUE__PROPERTIES:
+			return isSetProperties();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //EnumValueImpl
+} // EnumValueImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/IdentifiableImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/IdentifiableImpl.java
index e4699fc..a8d7c0d 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/IdentifiableImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/IdentifiableImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,7 +18,7 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.rmf.reqif10.AlternativeID;
 import org.eclipse.rmf.reqif10.Identifiable;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
@@ -28,17 +28,17 @@
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.IdentifiableImpl#getDesc <em>Desc</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.IdentifiableImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.IdentifiableImpl#getLastChange <em>Last Change</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.IdentifiableImpl#getLongName <em>Long Name</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.IdentifiableImpl#getAlternativeID <em>Alternative ID</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.IdentifiableImpl#getDesc <em>Desc</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.IdentifiableImpl#getIdentifier <em>Identifier</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.IdentifiableImpl#getLastChange <em>Last Change</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.IdentifiableImpl#getLongName <em>Long Name</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.IdentifiableImpl#getAlternativeID <em>Alternative ID</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public abstract class IdentifiableImpl extends EObjectImpl implements Identifiable {
+public abstract class IdentifiableImpl extends MinimalEObjectImpl implements Identifiable {
 	/**
 	 * The default value of the '{@link #getDesc() <em>Desc</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
@@ -60,17 +60,17 @@
 	protected String desc = DESC_EDEFAULT;
 
 	/**
-	 * This is true if the Desc attribute has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This is true if the Desc attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean descESet;
 
 	/**
-	 * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getIdentifier()
 	 * @generated
 	 * @ordered
@@ -78,9 +78,9 @@
 	protected static final String IDENTIFIER_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getIdentifier()
 	 * @generated
 	 * @ordered
@@ -88,17 +88,17 @@
 	protected String identifier = IDENTIFIER_EDEFAULT;
 
 	/**
-	 * This is true if the Identifier attribute has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This is true if the Identifier attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean identifierESet;
 
 	/**
-	 * The default value of the '{@link #getLastChange() <em>Last Change</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getLastChange() <em>Last Change</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getLastChange()
 	 * @generated
 	 * @ordered
@@ -106,9 +106,9 @@
 	protected static final GregorianCalendar LAST_CHANGE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLastChange() <em>Last Change</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getLastChange() <em>Last Change</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getLastChange()
 	 * @generated
 	 * @ordered
@@ -116,17 +116,17 @@
 	protected GregorianCalendar lastChange = LAST_CHANGE_EDEFAULT;
 
 	/**
-	 * This is true if the Last Change attribute has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This is true if the Last Change attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean lastChangeESet;
 
 	/**
-	 * The default value of the '{@link #getLongName() <em>Long Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getLongName() <em>Long Name</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getLongName()
 	 * @generated
 	 * @ordered
@@ -134,9 +134,9 @@
 	protected static final String LONG_NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLongName() <em>Long Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getLongName() <em>Long Name</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getLongName()
 	 * @generated
 	 * @ordered
@@ -144,8 +144,8 @@
 	protected String longName = LONG_NAME_EDEFAULT;
 
 	/**
-	 * This is true if the Long Name attribute has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This is true if the Long Name attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -172,6 +172,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IdentifiableImpl() {
@@ -180,6 +181,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -189,6 +191,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getDesc() {
@@ -197,6 +200,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDesc(String newDesc) {
@@ -204,12 +208,14 @@
 		desc = newDesc;
 		boolean oldDescESet = descESet;
 		descESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.IDENTIFIABLE__DESC, oldDesc, desc, !oldDescESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDesc() {
@@ -217,12 +223,14 @@
 		boolean oldDescESet = descESet;
 		desc = DESC_EDEFAULT;
 		descESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.IDENTIFIABLE__DESC, oldDesc, DESC_EDEFAULT, oldDescESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDesc() {
@@ -231,6 +239,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getIdentifier() {
@@ -239,6 +248,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIdentifier(String newIdentifier) {
@@ -246,12 +256,15 @@
 		identifier = newIdentifier;
 		boolean oldIdentifierESet = identifierESet;
 		identifierESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.IDENTIFIABLE__IDENTIFIER, oldIdentifier, identifier, !oldIdentifierESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.IDENTIFIABLE__IDENTIFIER, oldIdentifier, identifier,
+					!oldIdentifierESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetIdentifier() {
@@ -259,12 +272,15 @@
 		boolean oldIdentifierESet = identifierESet;
 		identifier = IDENTIFIER_EDEFAULT;
 		identifierESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.IDENTIFIABLE__IDENTIFIER, oldIdentifier, IDENTIFIER_EDEFAULT, oldIdentifierESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.IDENTIFIABLE__IDENTIFIER, oldIdentifier, IDENTIFIER_EDEFAULT,
+					oldIdentifierESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetIdentifier() {
@@ -273,6 +289,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GregorianCalendar getLastChange() {
@@ -281,6 +298,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLastChange(GregorianCalendar newLastChange) {
@@ -288,12 +306,15 @@
 		lastChange = newLastChange;
 		boolean oldLastChangeESet = lastChangeESet;
 		lastChangeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.IDENTIFIABLE__LAST_CHANGE, oldLastChange, lastChange, !oldLastChangeESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.IDENTIFIABLE__LAST_CHANGE, oldLastChange, lastChange,
+					!oldLastChangeESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetLastChange() {
@@ -301,12 +322,15 @@
 		boolean oldLastChangeESet = lastChangeESet;
 		lastChange = LAST_CHANGE_EDEFAULT;
 		lastChangeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.IDENTIFIABLE__LAST_CHANGE, oldLastChange, LAST_CHANGE_EDEFAULT, oldLastChangeESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.IDENTIFIABLE__LAST_CHANGE, oldLastChange, LAST_CHANGE_EDEFAULT,
+					oldLastChangeESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetLastChange() {
@@ -315,6 +339,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLongName() {
@@ -323,6 +348,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLongName(String newLongName) {
@@ -330,12 +356,14 @@
 		longName = newLongName;
 		boolean oldLongNameESet = longNameESet;
 		longNameESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.IDENTIFIABLE__LONG_NAME, oldLongName, longName, !oldLongNameESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetLongName() {
@@ -343,12 +371,15 @@
 		boolean oldLongNameESet = longNameESet;
 		longName = LONG_NAME_EDEFAULT;
 		longNameESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.IDENTIFIABLE__LONG_NAME, oldLongName, LONG_NAME_EDEFAULT, oldLongNameESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.IDENTIFIABLE__LONG_NAME, oldLongName, LONG_NAME_EDEFAULT,
+					oldLongNameESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetLongName() {
@@ -357,6 +388,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AlternativeID getAlternativeID() {
@@ -365,6 +397,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetAlternativeID(AlternativeID newAlternativeID, NotificationChain msgs) {
@@ -373,36 +406,50 @@
 		boolean oldAlternativeIDESet = alternativeIDESet;
 		alternativeIDESet = true;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID, oldAlternativeID, newAlternativeID, !oldAlternativeIDESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID,
+					oldAlternativeID, newAlternativeID, !oldAlternativeIDESet);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAlternativeID(AlternativeID newAlternativeID) {
 		if (newAlternativeID != alternativeID) {
 			NotificationChain msgs = null;
-			if (alternativeID != null)
-				msgs = ((InternalEObject)alternativeID).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID, null, msgs);
-			if (newAlternativeID != null)
-				msgs = ((InternalEObject)newAlternativeID).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID, null, msgs);
+			if (alternativeID != null) {
+				msgs = ((InternalEObject) alternativeID).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID,
+						null, msgs);
+			}
+			if (newAlternativeID != null) {
+				msgs = ((InternalEObject) newAlternativeID).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID,
+						null, msgs);
+			}
 			msgs = basicSetAlternativeID(newAlternativeID, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else {
 			boolean oldAlternativeIDESet = alternativeIDESet;
 			alternativeIDESet = true;
-			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID, newAlternativeID, newAlternativeID, !oldAlternativeIDESet));
+			if (eNotificationRequired()) {
+				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID, newAlternativeID,
+						newAlternativeID, !oldAlternativeIDESet));
+			}
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetAlternativeID(NotificationChain msgs) {
@@ -411,33 +458,43 @@
 		boolean oldAlternativeIDESet = alternativeIDESet;
 		alternativeIDESet = false;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID, oldAlternativeID, null, oldAlternativeIDESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID,
+					oldAlternativeID, null, oldAlternativeIDESet);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetAlternativeID() {
 		if (alternativeID != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject)alternativeID).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID, null, msgs);
+			msgs = ((InternalEObject) alternativeID).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID, null,
+					msgs);
 			msgs = basicUnsetAlternativeID(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else {
 			boolean oldAlternativeIDESet = alternativeIDESet;
 			alternativeIDESet = false;
-			if (eNotificationRequired())
+			if (eNotificationRequired()) {
 				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID, null, null, oldAlternativeIDESet));
+			}
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetAlternativeID() {
@@ -446,128 +503,152 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID:
-				return basicUnsetAlternativeID(msgs);
+		case ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID:
+			return basicUnsetAlternativeID(msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.IDENTIFIABLE__DESC:
-				return getDesc();
-			case ReqIF10Package.IDENTIFIABLE__IDENTIFIER:
-				return getIdentifier();
-			case ReqIF10Package.IDENTIFIABLE__LAST_CHANGE:
-				return getLastChange();
-			case ReqIF10Package.IDENTIFIABLE__LONG_NAME:
-				return getLongName();
-			case ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID:
-				return getAlternativeID();
+		case ReqIF10Package.IDENTIFIABLE__DESC:
+			return getDesc();
+		case ReqIF10Package.IDENTIFIABLE__IDENTIFIER:
+			return getIdentifier();
+		case ReqIF10Package.IDENTIFIABLE__LAST_CHANGE:
+			return getLastChange();
+		case ReqIF10Package.IDENTIFIABLE__LONG_NAME:
+			return getLongName();
+		case ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID:
+			return getAlternativeID();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.IDENTIFIABLE__DESC:
-				setDesc((String)newValue);
-				return;
-			case ReqIF10Package.IDENTIFIABLE__IDENTIFIER:
-				setIdentifier((String)newValue);
-				return;
-			case ReqIF10Package.IDENTIFIABLE__LAST_CHANGE:
-				setLastChange((GregorianCalendar)newValue);
-				return;
-			case ReqIF10Package.IDENTIFIABLE__LONG_NAME:
-				setLongName((String)newValue);
-				return;
-			case ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID:
-				setAlternativeID((AlternativeID)newValue);
-				return;
+		case ReqIF10Package.IDENTIFIABLE__DESC:
+			setDesc((String) newValue);
+			return;
+		case ReqIF10Package.IDENTIFIABLE__IDENTIFIER:
+			setIdentifier((String) newValue);
+			return;
+		case ReqIF10Package.IDENTIFIABLE__LAST_CHANGE:
+			setLastChange((GregorianCalendar) newValue);
+			return;
+		case ReqIF10Package.IDENTIFIABLE__LONG_NAME:
+			setLongName((String) newValue);
+			return;
+		case ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID:
+			setAlternativeID((AlternativeID) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.IDENTIFIABLE__DESC:
-				unsetDesc();
-				return;
-			case ReqIF10Package.IDENTIFIABLE__IDENTIFIER:
-				unsetIdentifier();
-				return;
-			case ReqIF10Package.IDENTIFIABLE__LAST_CHANGE:
-				unsetLastChange();
-				return;
-			case ReqIF10Package.IDENTIFIABLE__LONG_NAME:
-				unsetLongName();
-				return;
-			case ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID:
-				unsetAlternativeID();
-				return;
+		case ReqIF10Package.IDENTIFIABLE__DESC:
+			unsetDesc();
+			return;
+		case ReqIF10Package.IDENTIFIABLE__IDENTIFIER:
+			unsetIdentifier();
+			return;
+		case ReqIF10Package.IDENTIFIABLE__LAST_CHANGE:
+			unsetLastChange();
+			return;
+		case ReqIF10Package.IDENTIFIABLE__LONG_NAME:
+			unsetLongName();
+			return;
+		case ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID:
+			unsetAlternativeID();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.IDENTIFIABLE__DESC:
-				return isSetDesc();
-			case ReqIF10Package.IDENTIFIABLE__IDENTIFIER:
-				return isSetIdentifier();
-			case ReqIF10Package.IDENTIFIABLE__LAST_CHANGE:
-				return isSetLastChange();
-			case ReqIF10Package.IDENTIFIABLE__LONG_NAME:
-				return isSetLongName();
-			case ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID:
-				return isSetAlternativeID();
+		case ReqIF10Package.IDENTIFIABLE__DESC:
+			return isSetDesc();
+		case ReqIF10Package.IDENTIFIABLE__IDENTIFIER:
+			return isSetIdentifier();
+		case ReqIF10Package.IDENTIFIABLE__LAST_CHANGE:
+			return isSetLastChange();
+		case ReqIF10Package.IDENTIFIABLE__LONG_NAME:
+			return isSetLongName();
+		case ReqIF10Package.IDENTIFIABLE__ALTERNATIVE_ID:
+			return isSetAlternativeID();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy()) {
+			return super.toString();
+		}
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (desc: ");
-		if (descESet) result.append(desc); else result.append("<unset>");
-		result.append(", identifier: ");
-		if (identifierESet) result.append(identifier); else result.append("<unset>");
-		result.append(", lastChange: ");
-		if (lastChangeESet) result.append(lastChange); else result.append("<unset>");
-		result.append(", longName: ");
-		if (longNameESet) result.append(longName); else result.append("<unset>");
+		result.append(" (desc: "); //$NON-NLS-1$
+		if (descESet) {
+			result.append(desc);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", identifier: "); //$NON-NLS-1$
+		if (identifierESet) {
+			result.append(identifier);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", lastChange: "); //$NON-NLS-1$
+		if (lastChangeESet) {
+			result.append(lastChange);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", longName: "); //$NON-NLS-1$
+		if (longNameESet) {
+			result.append(longName);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
 		result.append(')');
 		return result.toString();
 	}
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/RelationGroupImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/RelationGroupImpl.java
index 1921b7a..cf65f59 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/RelationGroupImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/RelationGroupImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,17 +14,12 @@
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.rmf.reqif10.RelationGroup;
 import org.eclipse.rmf.reqif10.RelationGroupType;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
@@ -32,26 +27,24 @@
 import org.eclipse.rmf.reqif10.Specification;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Relation Group</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Relation Group</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.RelationGroupImpl#getSpecRelations <em>Spec Relations</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.RelationGroupImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.RelationGroupImpl#getSourceSpecification <em>Source Specification</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.RelationGroupImpl#getTargetSpecification <em>Target Specification</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.RelationGroupImpl#getSpecRelations <em>Spec Relations</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.RelationGroupImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.RelationGroupImpl#getSourceSpecification <em>Source Specification</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.RelationGroupImpl#getTargetSpecification <em>Target Specification</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RelationGroupImpl extends IdentifiableImpl implements RelationGroup {
 	/**
-	 * The cached value of the '{@link #getSpecRelations() <em>Spec Relations</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpecRelations() <em>Spec Relations</em>}' reference list. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSpecRelations()
 	 * @generated
 	 * @ordered
@@ -59,9 +52,9 @@
 	protected EList<SpecRelation> specRelations;
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -69,18 +62,17 @@
 	protected RelationGroupType type;
 
 	/**
-	 * This is true if the Type reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Type reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean typeESet;
 
 	/**
-	 * The cached value of the '{@link #getSourceSpecification() <em>Source Specification</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSourceSpecification() <em>Source Specification</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSourceSpecification()
 	 * @generated
 	 * @ordered
@@ -88,18 +80,17 @@
 	protected Specification sourceSpecification;
 
 	/**
-	 * This is true if the Source Specification reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Source Specification reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean sourceSpecificationESet;
 
 	/**
-	 * The cached value of the '{@link #getTargetSpecification() <em>Target Specification</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTargetSpecification() <em>Target Specification</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetSpecification()
 	 * @generated
 	 * @ordered
@@ -107,17 +98,16 @@
 	protected Specification targetSpecification;
 
 	/**
-	 * This is true if the Target Specification reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Target Specification reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean targetSpecificationESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RelationGroupImpl() {
@@ -125,8 +115,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -135,44 +125,46 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<SpecRelation> getSpecRelations() {
 		if (specRelations == null) {
-			specRelations = new EObjectResolvingEList.Unsettable<SpecRelation>(SpecRelation.class, this, ReqIF10Package.RELATION_GROUP__SPEC_RELATIONS);
+			specRelations = new EObjectResolvingEList.Unsettable<SpecRelation>(SpecRelation.class, this,
+					ReqIF10Package.RELATION_GROUP__SPEC_RELATIONS);
 		}
 		return specRelations;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpecRelations() {
-		if (specRelations != null) ((InternalEList.Unsettable<?>)specRelations).unset();
+		if (specRelations != null)
+			((InternalEList.Unsettable<?>) specRelations).unset();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpecRelations() {
-		return specRelations != null && ((InternalEList.Unsettable<?>)specRelations).isSet();
+		return specRelations != null && ((InternalEList.Unsettable<?>) specRelations).isSet();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RelationGroupType getType() {
 		if (type != null && type.eIsProxy()) {
-			InternalEObject oldType = (InternalEObject)type;
-			type = (RelationGroupType)eResolveProxy(oldType);
+			InternalEObject oldType = (InternalEObject) type;
+			type = (RelationGroupType) eResolveProxy(oldType);
 			if (type != oldType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.RELATION_GROUP__TYPE, oldType, type));
@@ -182,8 +174,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RelationGroupType basicGetType() {
@@ -191,8 +183,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(RelationGroupType newType) {
@@ -205,8 +197,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetType() {
@@ -219,8 +211,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetType() {
@@ -228,25 +220,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Specification getSourceSpecification() {
 		if (sourceSpecification != null && sourceSpecification.eIsProxy()) {
-			InternalEObject oldSourceSpecification = (InternalEObject)sourceSpecification;
-			sourceSpecification = (Specification)eResolveProxy(oldSourceSpecification);
+			InternalEObject oldSourceSpecification = (InternalEObject) sourceSpecification;
+			sourceSpecification = (Specification) eResolveProxy(oldSourceSpecification);
 			if (sourceSpecification != oldSourceSpecification) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.RELATION_GROUP__SOURCE_SPECIFICATION, oldSourceSpecification, sourceSpecification));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.RELATION_GROUP__SOURCE_SPECIFICATION,
+							oldSourceSpecification, sourceSpecification));
 			}
 		}
 		return sourceSpecification;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Specification basicGetSourceSpecification() {
@@ -254,8 +247,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSourceSpecification(Specification newSourceSpecification) {
@@ -264,12 +257,13 @@
 		boolean oldSourceSpecificationESet = sourceSpecificationESet;
 		sourceSpecificationESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.RELATION_GROUP__SOURCE_SPECIFICATION, oldSourceSpecification, sourceSpecification, !oldSourceSpecificationESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.RELATION_GROUP__SOURCE_SPECIFICATION, oldSourceSpecification,
+					sourceSpecification, !oldSourceSpecificationESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSourceSpecification() {
@@ -278,12 +272,13 @@
 		sourceSpecification = null;
 		sourceSpecificationESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.RELATION_GROUP__SOURCE_SPECIFICATION, oldSourceSpecification, null, oldSourceSpecificationESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.RELATION_GROUP__SOURCE_SPECIFICATION, oldSourceSpecification,
+					null, oldSourceSpecificationESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSourceSpecification() {
@@ -291,25 +286,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Specification getTargetSpecification() {
 		if (targetSpecification != null && targetSpecification.eIsProxy()) {
-			InternalEObject oldTargetSpecification = (InternalEObject)targetSpecification;
-			targetSpecification = (Specification)eResolveProxy(oldTargetSpecification);
+			InternalEObject oldTargetSpecification = (InternalEObject) targetSpecification;
+			targetSpecification = (Specification) eResolveProxy(oldTargetSpecification);
 			if (targetSpecification != oldTargetSpecification) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.RELATION_GROUP__TARGET_SPECIFICATION, oldTargetSpecification, targetSpecification));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.RELATION_GROUP__TARGET_SPECIFICATION,
+							oldTargetSpecification, targetSpecification));
 			}
 		}
 		return targetSpecification;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Specification basicGetTargetSpecification() {
@@ -317,8 +313,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTargetSpecification(Specification newTargetSpecification) {
@@ -327,12 +323,13 @@
 		boolean oldTargetSpecificationESet = targetSpecificationESet;
 		targetSpecificationESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.RELATION_GROUP__TARGET_SPECIFICATION, oldTargetSpecification, targetSpecification, !oldTargetSpecificationESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.RELATION_GROUP__TARGET_SPECIFICATION, oldTargetSpecification,
+					targetSpecification, !oldTargetSpecificationESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetTargetSpecification() {
@@ -341,12 +338,13 @@
 		targetSpecification = null;
 		targetSpecificationESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.RELATION_GROUP__TARGET_SPECIFICATION, oldTargetSpecification, null, oldTargetSpecificationESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.RELATION_GROUP__TARGET_SPECIFICATION, oldTargetSpecification,
+					null, oldTargetSpecificationESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetTargetSpecification() {
@@ -354,96 +352,99 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.RELATION_GROUP__SPEC_RELATIONS:
-				return getSpecRelations();
-			case ReqIF10Package.RELATION_GROUP__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case ReqIF10Package.RELATION_GROUP__SOURCE_SPECIFICATION:
-				if (resolve) return getSourceSpecification();
-				return basicGetSourceSpecification();
-			case ReqIF10Package.RELATION_GROUP__TARGET_SPECIFICATION:
-				if (resolve) return getTargetSpecification();
-				return basicGetTargetSpecification();
+		case ReqIF10Package.RELATION_GROUP__SPEC_RELATIONS:
+			return getSpecRelations();
+		case ReqIF10Package.RELATION_GROUP__TYPE:
+			if (resolve)
+				return getType();
+			return basicGetType();
+		case ReqIF10Package.RELATION_GROUP__SOURCE_SPECIFICATION:
+			if (resolve)
+				return getSourceSpecification();
+			return basicGetSourceSpecification();
+		case ReqIF10Package.RELATION_GROUP__TARGET_SPECIFICATION:
+			if (resolve)
+				return getTargetSpecification();
+			return basicGetTargetSpecification();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.RELATION_GROUP__SPEC_RELATIONS:
-				getSpecRelations().clear();
-				getSpecRelations().addAll((Collection<? extends SpecRelation>)newValue);
-				return;
-			case ReqIF10Package.RELATION_GROUP__TYPE:
-				setType((RelationGroupType)newValue);
-				return;
-			case ReqIF10Package.RELATION_GROUP__SOURCE_SPECIFICATION:
-				setSourceSpecification((Specification)newValue);
-				return;
-			case ReqIF10Package.RELATION_GROUP__TARGET_SPECIFICATION:
-				setTargetSpecification((Specification)newValue);
-				return;
+		case ReqIF10Package.RELATION_GROUP__SPEC_RELATIONS:
+			getSpecRelations().clear();
+			getSpecRelations().addAll((Collection<? extends SpecRelation>) newValue);
+			return;
+		case ReqIF10Package.RELATION_GROUP__TYPE:
+			setType((RelationGroupType) newValue);
+			return;
+		case ReqIF10Package.RELATION_GROUP__SOURCE_SPECIFICATION:
+			setSourceSpecification((Specification) newValue);
+			return;
+		case ReqIF10Package.RELATION_GROUP__TARGET_SPECIFICATION:
+			setTargetSpecification((Specification) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.RELATION_GROUP__SPEC_RELATIONS:
-				unsetSpecRelations();
-				return;
-			case ReqIF10Package.RELATION_GROUP__TYPE:
-				unsetType();
-				return;
-			case ReqIF10Package.RELATION_GROUP__SOURCE_SPECIFICATION:
-				unsetSourceSpecification();
-				return;
-			case ReqIF10Package.RELATION_GROUP__TARGET_SPECIFICATION:
-				unsetTargetSpecification();
-				return;
+		case ReqIF10Package.RELATION_GROUP__SPEC_RELATIONS:
+			unsetSpecRelations();
+			return;
+		case ReqIF10Package.RELATION_GROUP__TYPE:
+			unsetType();
+			return;
+		case ReqIF10Package.RELATION_GROUP__SOURCE_SPECIFICATION:
+			unsetSourceSpecification();
+			return;
+		case ReqIF10Package.RELATION_GROUP__TARGET_SPECIFICATION:
+			unsetTargetSpecification();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.RELATION_GROUP__SPEC_RELATIONS:
-				return isSetSpecRelations();
-			case ReqIF10Package.RELATION_GROUP__TYPE:
-				return isSetType();
-			case ReqIF10Package.RELATION_GROUP__SOURCE_SPECIFICATION:
-				return isSetSourceSpecification();
-			case ReqIF10Package.RELATION_GROUP__TARGET_SPECIFICATION:
-				return isSetTargetSpecification();
+		case ReqIF10Package.RELATION_GROUP__SPEC_RELATIONS:
+			return isSetSpecRelations();
+		case ReqIF10Package.RELATION_GROUP__TYPE:
+			return isSetType();
+		case ReqIF10Package.RELATION_GROUP__SOURCE_SPECIFICATION:
+			return isSetSourceSpecification();
+		case ReqIF10Package.RELATION_GROUP__TARGET_SPECIFICATION:
+			return isSetTargetSpecification();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //RelationGroupImpl
+} // RelationGroupImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/RelationGroupTypeImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/RelationGroupTypeImpl.java
index 68b9dc4..a591a44 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/RelationGroupTypeImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/RelationGroupTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,23 +12,21 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.rmf.reqif10.RelationGroupType;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Relation Group Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Relation Group Type</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class RelationGroupTypeImpl extends SpecTypeImpl implements RelationGroupType {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RelationGroupTypeImpl() {
@@ -36,8 +34,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -45,4 +43,4 @@
 		return ReqIF10Package.Literals.RELATION_GROUP_TYPE;
 	}
 
-} //RelationGroupTypeImpl
+} // RelationGroupTypeImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIF10FactoryImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIF10FactoryImpl.java
index 9536c59..19ef0d9 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIF10FactoryImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIF10FactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -189,7 +189,7 @@
 		case ReqIF10Package.XHTML_CONTENT:
 			return createXhtmlContent();
 		default:
-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
@@ -206,7 +206,7 @@
 		case ReqIF10Package.ID:
 			return createIDFromString(eDataType, initialValue);
 		default:
-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
@@ -223,7 +223,7 @@
 		case ReqIF10Package.ID:
 			return convertIDToString(eDataType, instanceValue);
 		default:
-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIF10PackageImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIF10PackageImpl.java
index d6b3f7b..46a4f75 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIF10PackageImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIF10PackageImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -464,9 +464,8 @@
 	 * @generated
 	 */
 	public static ReqIF10Package init() {
-		if (isInited) {
+		if (isInited)
 			return (ReqIF10Package) EPackage.Registry.INSTANCE.getEPackage(ReqIF10Package.eNS_URI);
-		}
 
 		// Obtain or create and register package
 		ReqIF10PackageImpl theReqIF10Package = (ReqIF10PackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ReqIF10PackageImpl ? EPackage.Registry.INSTANCE
@@ -1729,9 +1728,8 @@
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) {
+		if (isCreated)
 			return;
-		}
 		isCreated = true;
 
 		// Create classes and their features
@@ -1935,9 +1933,8 @@
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) {
+		if (isInitialized)
 			return;
-		}
 		isInitialized = true;
 
 		// Initialize package
@@ -1953,358 +1950,564 @@
 		// Set bounds for type parameters
 
 		// Add supertypes to classes
-		accessControlledElementEClass.getESuperTypes().add(getIdentifiable());
-		attributeValueXHTMLEClass.getESuperTypes().add(getAttributeValue());
-		specElementWithAttributesEClass.getESuperTypes().add(getIdentifiable());
-		attributeDefinitionXHTMLEClass.getESuperTypes().add(getAttributeDefinition());
-		attributeDefinitionEClass.getESuperTypes().add(getAccessControlledElement());
-		specTypeEClass.getESuperTypes().add(getIdentifiable());
-		specObjectEClass.getESuperTypes().add(getSpecElementWithAttributes());
-		specObjectTypeEClass.getESuperTypes().add(getSpecType());
-		specificationEClass.getESuperTypes().add(getSpecElementWithAttributes());
-		specificationTypeEClass.getESuperTypes().add(getSpecType());
-		specHierarchyEClass.getESuperTypes().add(getAccessControlledElement());
-		datatypeDefinitionEClass.getESuperTypes().add(getIdentifiable());
-		specRelationEClass.getESuperTypes().add(getSpecElementWithAttributes());
-		specRelationTypeEClass.getESuperTypes().add(getSpecType());
-		relationGroupEClass.getESuperTypes().add(getIdentifiable());
-		relationGroupTypeEClass.getESuperTypes().add(getSpecType());
-		datatypeDefinitionXHTMLEClass.getESuperTypes().add(getDatatypeDefinition());
-		attributeDefinitionBooleanEClass.getESuperTypes().add(getAttributeDefinitionSimple());
-		attributeDefinitionSimpleEClass.getESuperTypes().add(getAttributeDefinition());
-		datatypeDefinitionBooleanEClass.getESuperTypes().add(getDatatypeDefinitionSimple());
-		datatypeDefinitionSimpleEClass.getESuperTypes().add(getDatatypeDefinition());
-		attributeValueBooleanEClass.getESuperTypes().add(getAttributeValueSimple());
-		attributeValueSimpleEClass.getESuperTypes().add(getAttributeValue());
-		attributeDefinitionDateEClass.getESuperTypes().add(getAttributeDefinitionSimple());
-		datatypeDefinitionDateEClass.getESuperTypes().add(getDatatypeDefinitionSimple());
-		attributeValueDateEClass.getESuperTypes().add(getAttributeValueSimple());
-		attributeDefinitionEnumerationEClass.getESuperTypes().add(getAttributeDefinition());
-		datatypeDefinitionEnumerationEClass.getESuperTypes().add(getDatatypeDefinition());
-		enumValueEClass.getESuperTypes().add(getIdentifiable());
-		attributeValueEnumerationEClass.getESuperTypes().add(getAttributeValue());
-		attributeDefinitionIntegerEClass.getESuperTypes().add(getAttributeDefinitionSimple());
-		datatypeDefinitionIntegerEClass.getESuperTypes().add(getDatatypeDefinitionSimple());
-		attributeValueIntegerEClass.getESuperTypes().add(getAttributeValueSimple());
-		attributeDefinitionRealEClass.getESuperTypes().add(getAttributeDefinitionSimple());
-		datatypeDefinitionRealEClass.getESuperTypes().add(getDatatypeDefinitionSimple());
-		attributeValueRealEClass.getESuperTypes().add(getAttributeValueSimple());
-		attributeDefinitionStringEClass.getESuperTypes().add(getAttributeDefinitionSimple());
-		datatypeDefinitionStringEClass.getESuperTypes().add(getDatatypeDefinitionSimple());
-		attributeValueStringEClass.getESuperTypes().add(getAttributeValueSimple());
+		accessControlledElementEClass.getESuperTypes().add(this.getIdentifiable());
+		attributeValueXHTMLEClass.getESuperTypes().add(this.getAttributeValue());
+		specElementWithAttributesEClass.getESuperTypes().add(this.getIdentifiable());
+		attributeDefinitionXHTMLEClass.getESuperTypes().add(this.getAttributeDefinition());
+		attributeDefinitionEClass.getESuperTypes().add(this.getAccessControlledElement());
+		specTypeEClass.getESuperTypes().add(this.getIdentifiable());
+		specObjectEClass.getESuperTypes().add(this.getSpecElementWithAttributes());
+		specObjectTypeEClass.getESuperTypes().add(this.getSpecType());
+		specificationEClass.getESuperTypes().add(this.getSpecElementWithAttributes());
+		specificationTypeEClass.getESuperTypes().add(this.getSpecType());
+		specHierarchyEClass.getESuperTypes().add(this.getAccessControlledElement());
+		datatypeDefinitionEClass.getESuperTypes().add(this.getIdentifiable());
+		specRelationEClass.getESuperTypes().add(this.getSpecElementWithAttributes());
+		specRelationTypeEClass.getESuperTypes().add(this.getSpecType());
+		relationGroupEClass.getESuperTypes().add(this.getIdentifiable());
+		relationGroupTypeEClass.getESuperTypes().add(this.getSpecType());
+		datatypeDefinitionXHTMLEClass.getESuperTypes().add(this.getDatatypeDefinition());
+		attributeDefinitionBooleanEClass.getESuperTypes().add(this.getAttributeDefinitionSimple());
+		attributeDefinitionSimpleEClass.getESuperTypes().add(this.getAttributeDefinition());
+		datatypeDefinitionBooleanEClass.getESuperTypes().add(this.getDatatypeDefinitionSimple());
+		datatypeDefinitionSimpleEClass.getESuperTypes().add(this.getDatatypeDefinition());
+		attributeValueBooleanEClass.getESuperTypes().add(this.getAttributeValueSimple());
+		attributeValueSimpleEClass.getESuperTypes().add(this.getAttributeValue());
+		attributeDefinitionDateEClass.getESuperTypes().add(this.getAttributeDefinitionSimple());
+		datatypeDefinitionDateEClass.getESuperTypes().add(this.getDatatypeDefinitionSimple());
+		attributeValueDateEClass.getESuperTypes().add(this.getAttributeValueSimple());
+		attributeDefinitionEnumerationEClass.getESuperTypes().add(this.getAttributeDefinition());
+		datatypeDefinitionEnumerationEClass.getESuperTypes().add(this.getDatatypeDefinition());
+		enumValueEClass.getESuperTypes().add(this.getIdentifiable());
+		attributeValueEnumerationEClass.getESuperTypes().add(this.getAttributeValue());
+		attributeDefinitionIntegerEClass.getESuperTypes().add(this.getAttributeDefinitionSimple());
+		datatypeDefinitionIntegerEClass.getESuperTypes().add(this.getDatatypeDefinitionSimple());
+		attributeValueIntegerEClass.getESuperTypes().add(this.getAttributeValueSimple());
+		attributeDefinitionRealEClass.getESuperTypes().add(this.getAttributeDefinitionSimple());
+		datatypeDefinitionRealEClass.getESuperTypes().add(this.getDatatypeDefinitionSimple());
+		attributeValueRealEClass.getESuperTypes().add(this.getAttributeValueSimple());
+		attributeDefinitionStringEClass.getESuperTypes().add(this.getAttributeDefinitionSimple());
+		datatypeDefinitionStringEClass.getESuperTypes().add(this.getDatatypeDefinitionSimple());
+		attributeValueStringEClass.getESuperTypes().add(this.getAttributeValueSimple());
 
 		// Initialize classes and features; add operations and parameters
-		initEClass(accessControlledElementEClass, AccessControlledElement.class, "AccessControlledElement", IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAccessControlledElement_Editable(), ecorePackage.getEBoolean(), "editable", null, 0, 1, AccessControlledElement.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(accessControlledElementEClass, AccessControlledElement.class,
+				"AccessControlledElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getAccessControlledElement_Editable(),
+				ecorePackage.getEBoolean(),
+				"editable", null, 0, 1, AccessControlledElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(identifiableEClass, Identifiable.class, "Identifiable", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getIdentifiable_Desc(), ecorePackage.getEString(), "desc", null, 0, 1, Identifiable.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getIdentifiable_Identifier(), getID(), "identifier", null, 1, 1, Identifiable.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getIdentifiable_LastChange(), getDateTime(), "lastChange", null, 1, 1, Identifiable.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getIdentifiable_LongName(), ecorePackage.getEString(), "longName", null, 0, 1, Identifiable.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getIdentifiable_AlternativeID(), getAlternativeID(), null, "alternativeID", null, 0, 1, Identifiable.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(identifiableEClass, Identifiable.class, "Identifiable", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getIdentifiable_Desc(),
+				ecorePackage.getEString(),
+				"desc", null, 0, 1, Identifiable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(
+				getIdentifiable_Identifier(),
+				this.getID(),
+				"identifier", null, 1, 1, Identifiable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(
+				getIdentifiable_LastChange(),
+				this.getDateTime(),
+				"lastChange", null, 1, 1, Identifiable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(
+				getIdentifiable_LongName(),
+				ecorePackage.getEString(),
+				"longName", null, 0, 1, Identifiable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getIdentifiable_AlternativeID(),
+				this.getAlternativeID(),
+				null,
+				"alternativeID", null, 0, 1, Identifiable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(attributeValueXHTMLEClass, AttributeValueXHTML.class, "AttributeValueXHTML", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAttributeValueXHTML_Simplified(), ecorePackage.getEBoolean(), "simplified", null, 0, 1, AttributeValueXHTML.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getAttributeValueXHTML_Definition(), getAttributeDefinitionXHTML(), null, "definition", null, 1, 1, AttributeValueXHTML.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getAttributeValueXHTML_TheOriginalValue(), getXhtmlContent(), null, "theOriginalValue", null, 0, 1, AttributeValueXHTML.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getAttributeValueXHTML_TheValue(), getXhtmlContent(), null, "theValue", null, 1, 1, AttributeValueXHTML.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(attributeValueXHTMLEClass, AttributeValueXHTML.class,
+				"AttributeValueXHTML", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getAttributeValueXHTML_Simplified(),
+				ecorePackage.getEBoolean(),
+				"simplified", null, 0, 1, AttributeValueXHTML.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeValueXHTML_Definition(),
+				this.getAttributeDefinitionXHTML(),
+				null,
+				"definition", null, 1, 1, AttributeValueXHTML.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeValueXHTML_TheOriginalValue(),
+				this.getXhtmlContent(),
+				null,
+				"theOriginalValue", null, 0, 1, AttributeValueXHTML.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeValueXHTML_TheValue(),
+				this.getXhtmlContent(),
+				null,
+				"theValue", null, 1, 1, AttributeValueXHTML.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(attributeValueEClass, AttributeValue.class, "AttributeValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(attributeValueEClass, AttributeValue.class, "AttributeValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(specElementWithAttributesEClass, SpecElementWithAttributes.class, "SpecElementWithAttributes", IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getSpecElementWithAttributes_Values(), getAttributeValue(), null, "values", null, 0, -1, SpecElementWithAttributes.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(specElementWithAttributesEClass, SpecElementWithAttributes.class,
+				"SpecElementWithAttributes", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getSpecElementWithAttributes_Values(),
+				this.getAttributeValue(),
+				null,
+				"values", null, 0, -1, SpecElementWithAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(attributeDefinitionXHTMLEClass, AttributeDefinitionXHTML.class, "AttributeDefinitionXHTML", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAttributeDefinitionXHTML_Type(), getDatatypeDefinitionXHTML(), null, "type", null, 1, 1, AttributeDefinitionXHTML.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getAttributeDefinitionXHTML_DefaultValue(), getAttributeValueXHTML(), null, "defaultValue", null, 0, 1,
-				AttributeDefinitionXHTML.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE,
-				IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(attributeDefinitionXHTMLEClass, AttributeDefinitionXHTML.class,
+				"AttributeDefinitionXHTML", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getAttributeDefinitionXHTML_Type(),
+				this.getDatatypeDefinitionXHTML(),
+				null,
+				"type", null, 1, 1, AttributeDefinitionXHTML.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeDefinitionXHTML_DefaultValue(),
+				this.getAttributeValueXHTML(),
+				null,
+				"defaultValue", null, 0, 1, AttributeDefinitionXHTML.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(attributeDefinitionEClass, AttributeDefinition.class, "AttributeDefinition", IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
+		initEClass(attributeDefinitionEClass, AttributeDefinition.class,
+				"AttributeDefinition", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(specTypeEClass, SpecType.class, "SpecType", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getSpecType_SpecAttributes(), getAttributeDefinition(), null, "specAttributes", null, 0, -1, SpecType.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(specTypeEClass, SpecType.class, "SpecType", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getSpecType_SpecAttributes(),
+				this.getAttributeDefinition(),
+				null,
+				"specAttributes", null, 0, -1, SpecType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(reqIFContentEClass, ReqIFContent.class, "ReqIFContent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getReqIFContent_Datatypes(), getDatatypeDefinition(), null, "datatypes", null, 0, -1, ReqIFContent.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getReqIFContent_SpecTypes(), getSpecType(), null, "specTypes", null, 0, -1, ReqIFContent.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getReqIFContent_SpecObjects(), getSpecObject(), null, "specObjects", null, 0, -1, ReqIFContent.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getReqIFContent_SpecRelations(), getSpecRelation(), null, "specRelations", null, 0, -1, ReqIFContent.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getReqIFContent_Specifications(), getSpecification(), null, "specifications", null, 0, -1, ReqIFContent.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getReqIFContent_SpecRelationGroups(), getRelationGroup(), null, "specRelationGroups", null, 0, -1, ReqIFContent.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(reqIFContentEClass, ReqIFContent.class, "ReqIFContent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getReqIFContent_Datatypes(),
+				this.getDatatypeDefinition(),
+				null,
+				"datatypes", null, 0, -1, ReqIFContent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getReqIFContent_SpecTypes(),
+				this.getSpecType(),
+				null,
+				"specTypes", null, 0, -1, ReqIFContent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getReqIFContent_SpecObjects(),
+				this.getSpecObject(),
+				null,
+				"specObjects", null, 0, -1, ReqIFContent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getReqIFContent_SpecRelations(),
+				this.getSpecRelation(),
+				null,
+				"specRelations", null, 0, -1, ReqIFContent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getReqIFContent_Specifications(),
+				this.getSpecification(),
+				null,
+				"specifications", null, 0, -1, ReqIFContent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getReqIFContent_SpecRelationGroups(),
+				this.getRelationGroup(),
+				null,
+				"specRelationGroups", null, 0, -1, ReqIFContent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(reqIFEClass, ReqIF.class, "ReqIF", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getReqIF_Lang(), theXMLNamespacePackage.getLangType(), "lang", null, 0, 1, ReqIF.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getReqIF_TheHeader(), getReqIFHeader(), null, "theHeader", null, 1, 1, ReqIF.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getReqIF_CoreContent(), getReqIFContent(), null, "coreContent", null, 1, 1, ReqIF.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getReqIF_ToolExtensions(), getReqIFToolExtension(), null, "toolExtensions", null, 0, -1, ReqIF.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(reqIFEClass, ReqIF.class, "ReqIF", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getReqIF_Lang(),
+				theXMLNamespacePackage.getLangType(),
+				"lang", null, 0, 1, ReqIF.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getReqIF_TheHeader(),
+				this.getReqIFHeader(),
+				null,
+				"theHeader", null, 1, 1, ReqIF.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getReqIF_CoreContent(),
+				this.getReqIFContent(),
+				null,
+				"coreContent", null, 1, 1, ReqIF.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getReqIF_ToolExtensions(),
+				this.getReqIFToolExtension(),
+				null,
+				"toolExtensions", null, 0, -1, ReqIF.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(reqIFHeaderEClass, ReqIFHeader.class, "ReqIFHeader", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getReqIFHeader_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, ReqIFHeader.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getReqIFHeader_CreationTime(), getDateTime(), "creationTime", null, 1, 1, ReqIFHeader.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getReqIFHeader_Identifier(), getID(), "identifier", null, 1, 1, ReqIFHeader.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getReqIFHeader_RepositoryId(), ecorePackage.getEString(), "repositoryId", null, 0, 1, ReqIFHeader.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getReqIFHeader_ReqIFToolId(), ecorePackage.getEString(), "reqIFToolId", null, 1, 1, ReqIFHeader.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getReqIFHeader_ReqIFVersion(), ecorePackage.getEString(), "reqIFVersion", null, 1, 1, ReqIFHeader.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getReqIFHeader_SourceToolId(), ecorePackage.getEString(), "sourceToolId", null, 1, 1, ReqIFHeader.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getReqIFHeader_Title(), ecorePackage.getEString(), "title", null, 1, 1, ReqIFHeader.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(reqIFHeaderEClass, ReqIFHeader.class, "ReqIFHeader", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getReqIFHeader_Comment(),
+				ecorePackage.getEString(),
+				"comment", null, 0, 1, ReqIFHeader.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(
+				getReqIFHeader_CreationTime(),
+				this.getDateTime(),
+				"creationTime", null, 1, 1, ReqIFHeader.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(
+				getReqIFHeader_Identifier(),
+				this.getID(),
+				"identifier", null, 1, 1, ReqIFHeader.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(
+				getReqIFHeader_RepositoryId(),
+				ecorePackage.getEString(),
+				"repositoryId", null, 0, 1, ReqIFHeader.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(
+				getReqIFHeader_ReqIFToolId(),
+				ecorePackage.getEString(),
+				"reqIFToolId", null, 1, 1, ReqIFHeader.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(
+				getReqIFHeader_ReqIFVersion(),
+				ecorePackage.getEString(),
+				"reqIFVersion", null, 1, 1, ReqIFHeader.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(
+				getReqIFHeader_SourceToolId(),
+				ecorePackage.getEString(),
+				"sourceToolId", null, 1, 1, ReqIFHeader.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(
+				getReqIFHeader_Title(),
+				ecorePackage.getEString(),
+				"title", null, 1, 1, ReqIFHeader.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(reqIFToolExtensionEClass, ReqIFToolExtension.class, "ReqIFToolExtension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getReqIFToolExtension_Extensions(), ecorePackage.getEObject(), null, "extensions", null, 0, -1, ReqIFToolExtension.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEClass(reqIFToolExtensionEClass, ReqIFToolExtension.class, "ReqIFToolExtension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getReqIFToolExtension_Extensions(),
+				ecorePackage.getEObject(),
+				null,
+				"extensions", null, 0, -1, ReqIFToolExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(specObjectEClass, SpecObject.class, "SpecObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getSpecObject_Type(), getSpecObjectType(), null, "type", null, 1, 1, SpecObject.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(specObjectEClass, SpecObject.class, "SpecObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getSpecObject_Type(),
+				this.getSpecObjectType(),
+				null,
+				"type", null, 1, 1, SpecObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(specObjectTypeEClass, SpecObjectType.class, "SpecObjectType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(specObjectTypeEClass, SpecObjectType.class, "SpecObjectType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(specificationEClass, Specification.class, "Specification", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getSpecification_Type(), getSpecificationType(), null, "type", null, 1, 1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getSpecification_Children(), getSpecHierarchy(), null, "children", null, 0, -1, Specification.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEClass(specificationEClass, Specification.class, "Specification", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getSpecification_Type(),
+				this.getSpecificationType(),
+				null,
+				"type", null, 1, 1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getSpecification_Children(),
+				this.getSpecHierarchy(),
+				null,
+				"children", null, 0, -1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(specificationTypeEClass, SpecificationType.class, "SpecificationType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(specificationTypeEClass, SpecificationType.class, "SpecificationType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(specHierarchyEClass, SpecHierarchy.class, "SpecHierarchy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSpecHierarchy_TableInternal(), ecorePackage.getEBoolean(), "tableInternal", null, 0, 1, SpecHierarchy.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getSpecHierarchy_Object(), getSpecObject(), null, "object", null, 1, 1, SpecHierarchy.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getSpecHierarchy_Children(), getSpecHierarchy(), null, "children", null, 0, -1, SpecHierarchy.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSpecHierarchy_EditableAtts(), getAttributeDefinition(), null, "editableAtts", null, 0, -1, SpecHierarchy.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(specHierarchyEClass, SpecHierarchy.class, "SpecHierarchy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getSpecHierarchy_TableInternal(),
+				ecorePackage.getEBoolean(),
+				"tableInternal", null, 0, 1, SpecHierarchy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getSpecHierarchy_Object(),
+				this.getSpecObject(),
+				null,
+				"object", null, 1, 1, SpecHierarchy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getSpecHierarchy_Children(),
+				this.getSpecHierarchy(),
+				null,
+				"children", null, 0, -1, SpecHierarchy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getSpecHierarchy_EditableAtts(),
+				this.getAttributeDefinition(),
+				null,
+				"editableAtts", null, 0, -1, SpecHierarchy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(datatypeDefinitionEClass, DatatypeDefinition.class, "DatatypeDefinition", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(datatypeDefinitionEClass, DatatypeDefinition.class, "DatatypeDefinition", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(specRelationEClass, SpecRelation.class, "SpecRelation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getSpecRelation_Target(), getSpecObject(), null, "target", null, 1, 1, SpecRelation.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getSpecRelation_Source(), getSpecObject(), null, "source", null, 1, 1, SpecRelation.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getSpecRelation_Type(), getSpecRelationType(), null, "type", null, 1, 1, SpecRelation.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(specRelationEClass, SpecRelation.class, "SpecRelation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getSpecRelation_Target(),
+				this.getSpecObject(),
+				null,
+				"target", null, 1, 1, SpecRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getSpecRelation_Source(),
+				this.getSpecObject(),
+				null,
+				"source", null, 1, 1, SpecRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getSpecRelation_Type(),
+				this.getSpecRelationType(),
+				null,
+				"type", null, 1, 1, SpecRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(specRelationTypeEClass, SpecRelationType.class, "SpecRelationType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(specRelationTypeEClass, SpecRelationType.class, "SpecRelationType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(relationGroupEClass, RelationGroup.class, "RelationGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getRelationGroup_SpecRelations(), getSpecRelation(), null, "specRelations", null, 0, -1, RelationGroup.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getRelationGroup_Type(), getRelationGroupType(), null, "type", null, 1, 1, RelationGroup.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getRelationGroup_SourceSpecification(), getSpecification(), null, "sourceSpecification", null, 1, 1, RelationGroup.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getRelationGroup_TargetSpecification(), getSpecification(), null, "targetSpecification", null, 1, 1, RelationGroup.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(relationGroupEClass, RelationGroup.class, "RelationGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getRelationGroup_SpecRelations(),
+				this.getSpecRelation(),
+				null,
+				"specRelations", null, 0, -1, RelationGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getRelationGroup_Type(),
+				this.getRelationGroupType(),
+				null,
+				"type", null, 1, 1, RelationGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getRelationGroup_SourceSpecification(),
+				this.getSpecification(),
+				null,
+				"sourceSpecification", null, 1, 1, RelationGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getRelationGroup_TargetSpecification(),
+				this.getSpecification(),
+				null,
+				"targetSpecification", null, 1, 1, RelationGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(relationGroupTypeEClass, RelationGroupType.class, "RelationGroupType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(relationGroupTypeEClass, RelationGroupType.class, "RelationGroupType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(datatypeDefinitionXHTMLEClass, DatatypeDefinitionXHTML.class, "DatatypeDefinitionXHTML", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
+		initEClass(datatypeDefinitionXHTMLEClass, DatatypeDefinitionXHTML.class,
+				"DatatypeDefinitionXHTML", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(alternativeIDEClass, AlternativeID.class, "AlternativeID", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAlternativeID_Identifier(), ecorePackage.getEString(), "identifier", null, 1, 1, AlternativeID.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(alternativeIDEClass, AlternativeID.class, "AlternativeID", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getAlternativeID_Identifier(),
+				ecorePackage.getEString(),
+				"identifier", null, 1, 1, AlternativeID.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(attributeDefinitionBooleanEClass, AttributeDefinitionBoolean.class, "AttributeDefinitionBoolean", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAttributeDefinitionBoolean_Type(), getDatatypeDefinitionBoolean(), null, "type", null, 1, 1,
-				AttributeDefinitionBoolean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE,
-				IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getAttributeDefinitionBoolean_DefaultValue(), getAttributeValueBoolean(), null, "defaultValue", null, 0, 1,
-				AttributeDefinitionBoolean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE,
-				IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(attributeDefinitionBooleanEClass, AttributeDefinitionBoolean.class,
+				"AttributeDefinitionBoolean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getAttributeDefinitionBoolean_Type(),
+				this.getDatatypeDefinitionBoolean(),
+				null,
+				"type", null, 1, 1, AttributeDefinitionBoolean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeDefinitionBoolean_DefaultValue(),
+				this.getAttributeValueBoolean(),
+				null,
+				"defaultValue", null, 0, 1, AttributeDefinitionBoolean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(attributeDefinitionSimpleEClass, AttributeDefinitionSimple.class, "AttributeDefinitionSimple", IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
+		initEClass(attributeDefinitionSimpleEClass, AttributeDefinitionSimple.class,
+				"AttributeDefinitionSimple", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(datatypeDefinitionBooleanEClass, DatatypeDefinitionBoolean.class, "DatatypeDefinitionBoolean", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
+		initEClass(datatypeDefinitionBooleanEClass, DatatypeDefinitionBoolean.class,
+				"DatatypeDefinitionBoolean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(datatypeDefinitionSimpleEClass, DatatypeDefinitionSimple.class, "DatatypeDefinitionSimple", IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
+		initEClass(datatypeDefinitionSimpleEClass, DatatypeDefinitionSimple.class,
+				"DatatypeDefinitionSimple", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(attributeValueBooleanEClass, AttributeValueBoolean.class, "AttributeValueBoolean", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAttributeValueBoolean_TheValue(), ecorePackage.getEBoolean(), "theValue", null, 1, 1, AttributeValueBoolean.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getAttributeValueBoolean_Definition(), getAttributeDefinitionBoolean(), null, "definition", null, 1, 1,
-				AttributeValueBoolean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
+		initEClass(attributeValueBooleanEClass, AttributeValueBoolean.class,
+				"AttributeValueBoolean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getAttributeValueBoolean_TheValue(),
+				ecorePackage.getEBoolean(),
+				"theValue", null, 1, 1, AttributeValueBoolean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeValueBoolean_Definition(),
+				this.getAttributeDefinitionBoolean(),
+				null,
+				"definition", null, 1, 1, AttributeValueBoolean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(attributeValueSimpleEClass, AttributeValueSimple.class, "AttributeValueSimple", IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
+		initEClass(attributeValueSimpleEClass, AttributeValueSimple.class,
+				"AttributeValueSimple", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(attributeDefinitionDateEClass, AttributeDefinitionDate.class, "AttributeDefinitionDate", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAttributeDefinitionDate_Type(), getDatatypeDefinitionDate(), null, "type", null, 1, 1, AttributeDefinitionDate.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getAttributeDefinitionDate_DefaultValue(), getAttributeValueDate(), null, "defaultValue", null, 0, 1,
-				AttributeDefinitionDate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE,
-				IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(attributeDefinitionDateEClass, AttributeDefinitionDate.class,
+				"AttributeDefinitionDate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getAttributeDefinitionDate_Type(),
+				this.getDatatypeDefinitionDate(),
+				null,
+				"type", null, 1, 1, AttributeDefinitionDate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeDefinitionDate_DefaultValue(),
+				this.getAttributeValueDate(),
+				null,
+				"defaultValue", null, 0, 1, AttributeDefinitionDate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(datatypeDefinitionDateEClass, DatatypeDefinitionDate.class, "DatatypeDefinitionDate", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
+		initEClass(datatypeDefinitionDateEClass, DatatypeDefinitionDate.class,
+				"DatatypeDefinitionDate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(attributeValueDateEClass, AttributeValueDate.class, "AttributeValueDate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAttributeValueDate_TheValue(), getDateTime(), "theValue", null, 1, 1, AttributeValueDate.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getAttributeValueDate_Definition(), getAttributeDefinitionDate(), null, "definition", null, 1, 1, AttributeValueDate.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(attributeValueDateEClass, AttributeValueDate.class, "AttributeValueDate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getAttributeValueDate_TheValue(),
+				this.getDateTime(),
+				"theValue", null, 1, 1, AttributeValueDate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeValueDate_Definition(),
+				this.getAttributeDefinitionDate(),
+				null,
+				"definition", null, 1, 1, AttributeValueDate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(attributeDefinitionEnumerationEClass, AttributeDefinitionEnumeration.class, "AttributeDefinitionEnumeration", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAttributeDefinitionEnumeration_MultiValued(), ecorePackage.getEBoolean(), "multiValued", null, 1, 1,
-				AttributeDefinitionEnumeration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEReference(getAttributeDefinitionEnumeration_Type(), getDatatypeDefinitionEnumeration(), null, "type", null, 1, 1,
-				AttributeDefinitionEnumeration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE,
-				IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getAttributeDefinitionEnumeration_DefaultValue(), getAttributeValueEnumeration(), null, "defaultValue", null, 0, 1,
-				AttributeDefinitionEnumeration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE,
-				IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(attributeDefinitionEnumerationEClass, AttributeDefinitionEnumeration.class,
+				"AttributeDefinitionEnumeration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getAttributeDefinitionEnumeration_MultiValued(),
+				ecorePackage.getEBoolean(),
+				"multiValued", null, 1, 1, AttributeDefinitionEnumeration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeDefinitionEnumeration_Type(),
+				this.getDatatypeDefinitionEnumeration(),
+				null,
+				"type", null, 1, 1, AttributeDefinitionEnumeration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeDefinitionEnumeration_DefaultValue(),
+				this.getAttributeValueEnumeration(),
+				null,
+				"defaultValue", null, 0, 1, AttributeDefinitionEnumeration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(datatypeDefinitionEnumerationEClass, DatatypeDefinitionEnumeration.class, "DatatypeDefinitionEnumeration", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDatatypeDefinitionEnumeration_SpecifiedValues(), getEnumValue(), null, "specifiedValues", null, 0, -1,
-				DatatypeDefinitionEnumeration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE,
-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEClass(datatypeDefinitionEnumerationEClass, DatatypeDefinitionEnumeration.class,
+				"DatatypeDefinitionEnumeration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getDatatypeDefinitionEnumeration_SpecifiedValues(),
+				this.getEnumValue(),
+				null,
+				"specifiedValues", null, 0, -1, DatatypeDefinitionEnumeration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(enumValueEClass, EnumValue.class, "EnumValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getEnumValue_Properties(), getEmbeddedValue(), null, "properties", null, 1, 1, EnumValue.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(enumValueEClass, EnumValue.class, "EnumValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getEnumValue_Properties(),
+				this.getEmbeddedValue(),
+				null,
+				"properties", null, 1, 1, EnumValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(embeddedValueEClass, EmbeddedValue.class, "EmbeddedValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEmbeddedValue_Key(), ecorePackage.getEBigInteger(), "key", null, 1, 1, EmbeddedValue.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getEmbeddedValue_OtherContent(), ecorePackage.getEString(), "otherContent", null, 1, 1, EmbeddedValue.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(embeddedValueEClass, EmbeddedValue.class, "EmbeddedValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getEmbeddedValue_Key(),
+				ecorePackage.getEBigInteger(),
+				"key", null, 1, 1, EmbeddedValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(
+				getEmbeddedValue_OtherContent(),
+				ecorePackage.getEString(),
+				"otherContent", null, 1, 1, EmbeddedValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(attributeValueEnumerationEClass, AttributeValueEnumeration.class, "AttributeValueEnumeration", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAttributeValueEnumeration_Values(), getEnumValue(), null, "values", null, 0, -1, AttributeValueEnumeration.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getAttributeValueEnumeration_Definition(), getAttributeDefinitionEnumeration(), null, "definition", null, 1, 1,
-				AttributeValueEnumeration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE,
-				IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(attributeValueEnumerationEClass, AttributeValueEnumeration.class,
+				"AttributeValueEnumeration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getAttributeValueEnumeration_Values(),
+				this.getEnumValue(),
+				null,
+				"values", null, 0, -1, AttributeValueEnumeration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeValueEnumeration_Definition(),
+				this.getAttributeDefinitionEnumeration(),
+				null,
+				"definition", null, 1, 1, AttributeValueEnumeration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(attributeDefinitionIntegerEClass, AttributeDefinitionInteger.class, "AttributeDefinitionInteger", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAttributeDefinitionInteger_Type(), getDatatypeDefinitionInteger(), null, "type", null, 1, 1,
-				AttributeDefinitionInteger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE,
-				IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getAttributeDefinitionInteger_DefaultValue(), getAttributeValueInteger(), null, "defaultValue", null, 0, 1,
-				AttributeDefinitionInteger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE,
-				IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(attributeDefinitionIntegerEClass, AttributeDefinitionInteger.class,
+				"AttributeDefinitionInteger", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getAttributeDefinitionInteger_Type(),
+				this.getDatatypeDefinitionInteger(),
+				null,
+				"type", null, 1, 1, AttributeDefinitionInteger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeDefinitionInteger_DefaultValue(),
+				this.getAttributeValueInteger(),
+				null,
+				"defaultValue", null, 0, 1, AttributeDefinitionInteger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(datatypeDefinitionIntegerEClass, DatatypeDefinitionInteger.class, "DatatypeDefinitionInteger", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDatatypeDefinitionInteger_Max(), ecorePackage.getEBigInteger(), "max", null, 1, 1, DatatypeDefinitionInteger.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getDatatypeDefinitionInteger_Min(), ecorePackage.getEBigInteger(), "min", null, 1, 1, DatatypeDefinitionInteger.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(datatypeDefinitionIntegerEClass, DatatypeDefinitionInteger.class,
+				"DatatypeDefinitionInteger", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getDatatypeDefinitionInteger_Max(),
+				ecorePackage.getEBigInteger(),
+				"max", null, 1, 1, DatatypeDefinitionInteger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(
+				getDatatypeDefinitionInteger_Min(),
+				ecorePackage.getEBigInteger(),
+				"min", null, 1, 1, DatatypeDefinitionInteger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(attributeValueIntegerEClass, AttributeValueInteger.class, "AttributeValueInteger", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAttributeValueInteger_TheValue(), ecorePackage.getEBigInteger(), "theValue", null, 1, 1, AttributeValueInteger.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getAttributeValueInteger_Definition(), getAttributeDefinitionInteger(), null, "definition", null, 1, 1,
-				AttributeValueInteger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
+		initEClass(attributeValueIntegerEClass, AttributeValueInteger.class,
+				"AttributeValueInteger", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getAttributeValueInteger_TheValue(),
+				ecorePackage.getEBigInteger(),
+				"theValue", null, 1, 1, AttributeValueInteger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeValueInteger_Definition(),
+				this.getAttributeDefinitionInteger(),
+				null,
+				"definition", null, 1, 1, AttributeValueInteger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(attributeDefinitionRealEClass, AttributeDefinitionReal.class, "AttributeDefinitionReal", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAttributeDefinitionReal_Type(), getDatatypeDefinitionReal(), null, "type", null, 1, 1, AttributeDefinitionReal.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getAttributeDefinitionReal_DefaultValue(), getAttributeValueReal(), null, "defaultValue", null, 0, 1,
-				AttributeDefinitionReal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE,
-				IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(attributeDefinitionRealEClass, AttributeDefinitionReal.class,
+				"AttributeDefinitionReal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getAttributeDefinitionReal_Type(),
+				this.getDatatypeDefinitionReal(),
+				null,
+				"type", null, 1, 1, AttributeDefinitionReal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeDefinitionReal_DefaultValue(),
+				this.getAttributeValueReal(),
+				null,
+				"defaultValue", null, 0, 1, AttributeDefinitionReal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(datatypeDefinitionRealEClass, DatatypeDefinitionReal.class, "DatatypeDefinitionReal", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDatatypeDefinitionReal_Accuracy(), ecorePackage.getEBigInteger(), "accuracy", null, 1, 1, DatatypeDefinitionReal.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getDatatypeDefinitionReal_Max(), ecorePackage.getEDouble(), "max", null, 1, 1, DatatypeDefinitionReal.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getDatatypeDefinitionReal_Min(), ecorePackage.getEDouble(), "min", null, 1, 1, DatatypeDefinitionReal.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(datatypeDefinitionRealEClass, DatatypeDefinitionReal.class,
+				"DatatypeDefinitionReal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getDatatypeDefinitionReal_Accuracy(),
+				ecorePackage.getEBigInteger(),
+				"accuracy", null, 1, 1, DatatypeDefinitionReal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(
+				getDatatypeDefinitionReal_Max(),
+				ecorePackage.getEDouble(),
+				"max", null, 1, 1, DatatypeDefinitionReal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(
+				getDatatypeDefinitionReal_Min(),
+				ecorePackage.getEDouble(),
+				"min", null, 1, 1, DatatypeDefinitionReal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(attributeValueRealEClass, AttributeValueReal.class, "AttributeValueReal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAttributeValueReal_TheValue(), ecorePackage.getEDouble(), "theValue", null, 1, 1, AttributeValueReal.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getAttributeValueReal_Definition(), getAttributeDefinitionReal(), null, "definition", null, 1, 1, AttributeValueReal.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(attributeValueRealEClass, AttributeValueReal.class, "AttributeValueReal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getAttributeValueReal_TheValue(),
+				ecorePackage.getEDouble(),
+				"theValue", null, 1, 1, AttributeValueReal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeValueReal_Definition(),
+				this.getAttributeDefinitionReal(),
+				null,
+				"definition", null, 1, 1, AttributeValueReal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(attributeDefinitionStringEClass, AttributeDefinitionString.class, "AttributeDefinitionString", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAttributeDefinitionString_Type(), getDatatypeDefinitionString(), null, "type", null, 1, 1, AttributeDefinitionString.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getAttributeDefinitionString_DefaultValue(), getAttributeValueString(), null, "defaultValue", null, 0, 1,
-				AttributeDefinitionString.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE,
-				IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(attributeDefinitionStringEClass, AttributeDefinitionString.class,
+				"AttributeDefinitionString", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getAttributeDefinitionString_Type(),
+				this.getDatatypeDefinitionString(),
+				null,
+				"type", null, 1, 1, AttributeDefinitionString.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeDefinitionString_DefaultValue(),
+				this.getAttributeValueString(),
+				null,
+				"defaultValue", null, 0, 1, AttributeDefinitionString.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(datatypeDefinitionStringEClass, DatatypeDefinitionString.class, "DatatypeDefinitionString", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDatatypeDefinitionString_MaxLength(), ecorePackage.getEBigInteger(), "maxLength", null, 1, 1,
-				DatatypeDefinitionString.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
+		initEClass(datatypeDefinitionStringEClass, DatatypeDefinitionString.class,
+				"DatatypeDefinitionString", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getDatatypeDefinitionString_MaxLength(),
+				ecorePackage.getEBigInteger(),
+				"maxLength", null, 1, 1, DatatypeDefinitionString.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(attributeValueStringEClass, AttributeValueString.class, "AttributeValueString", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAttributeValueString_TheValue(), ecorePackage.getEString(), "theValue", null, 1, 1, AttributeValueString.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getAttributeValueString_Definition(), getAttributeDefinitionString(), null, "definition", null, 1, 1,
-				AttributeValueString.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
+		initEClass(attributeValueStringEClass, AttributeValueString.class,
+				"AttributeValueString", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(
+				getAttributeValueString_TheValue(),
+				ecorePackage.getEString(),
+				"theValue", null, 1, 1, AttributeValueString.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(
+				getAttributeValueString_Definition(),
+				this.getAttributeDefinitionString(),
+				null,
+				"definition", null, 1, 1, AttributeValueString.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(xhtmlContentEClass, XhtmlContent.class, "XhtmlContent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXhtmlContent_Xhtml(), ecorePackage.getEObject(), null, "xhtml", null, 0, 1, XhtmlContent.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXhtmlContent_XhtmlSource(), ecorePackage.getEString(), "xhtmlSource", null, 0, 1, XhtmlContent.class, IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+		initEClass(xhtmlContentEClass, XhtmlContent.class, "XhtmlContent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(
+				getXhtmlContent_Xhtml(),
+				ecorePackage.getEObject(),
+				null,
+				"xhtml", null, 0, 1, XhtmlContent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(
+				getXhtmlContent_XhtmlSource(),
+				ecorePackage.getEString(),
+				"xhtmlSource", null, 0, 1, XhtmlContent.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
 		// Initialize data types
-		initEDataType(dateTimeEDataType, GregorianCalendar.class, "DateTime", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(idEDataType, String.class, "ID", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
+		initEDataType(dateTimeEDataType, GregorianCalendar.class, "DateTime", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(idEDataType, String.class, "ID", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
 		// Create resource
 		createResource(eNS_URI);
@@ -2323,185 +2526,472 @@
 	 * @generated
 	 */
 	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
-		addAnnotation(accessControlledElementEClass, source, new String[] { "name", "ACCESS-CONTROLLED-ELEMENT", "kind", "elementOnly" });
-		addAnnotation(getAccessControlledElement_Editable(), source, new String[] { "name", "IS-EDITABLE", "kind", "attribute" });
-		addAnnotation(identifiableEClass, source, new String[] { "name", "IDENTIFIABLE", "kind", "elementOnly" });
-		addAnnotation(getIdentifiable_Desc(), source, new String[] { "name", "DESC", "kind", "attribute" });
-		addAnnotation(getIdentifiable_Identifier(), source, new String[] { "name", "IDENTIFIER", "kind", "attribute" });
-		addAnnotation(getIdentifiable_LastChange(), source, new String[] { "name", "LAST-CHANGE", "kind", "attribute" });
-		addAnnotation(getIdentifiable_LongName(), source, new String[] { "name", "LONG-NAME", "kind", "attribute" });
-		addAnnotation(getIdentifiable_AlternativeID(), source, new String[] { "name", "ALTERNATIVE-ID", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(attributeValueXHTMLEClass, source, new String[] { "name", "ATTRIBUTE-VALUE-XHTML", "kind", "elementOnly" });
-		addAnnotation(getAttributeValueXHTML_Simplified(), source, new String[] { "name", "IS-SIMPLIFIED", "kind", "attribute" });
-		addAnnotation(getAttributeValueXHTML_Definition(), source, new String[] { "name", "DEFINITION", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(getAttributeValueXHTML_TheOriginalValue(), source, new String[] { "name", "THE-ORIGINAL-VALUE", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(getAttributeValueXHTML_TheValue(), source, new String[] { "name", "THE-VALUE", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(attributeValueEClass, source, new String[] { "name", "ATTRIBUTE-VALUE", "kind", "elementOnly" });
-		addAnnotation(specElementWithAttributesEClass, source, new String[] { "name", "SPEC-ELEMENT-WITH-ATTRIBUTES", "kind", "elementOnly" });
-		addAnnotation(getSpecElementWithAttributes_Values(), source, new String[] { "name", "VALUES", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(attributeDefinitionXHTMLEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION-XHTML", "kind", "elementOnly" });
-		addAnnotation(getAttributeDefinitionXHTML_Type(), source,
-				new String[] { "name", "TYPE", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(getAttributeDefinitionXHTML_DefaultValue(), source, new String[] { "name", "DEFAULT-VALUE", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(attributeDefinitionEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION", "kind", "elementOnly" });
-		addAnnotation(specTypeEClass, source, new String[] { "name", "SPEC-TYPE", "kind", "elementOnly" });
-		addAnnotation(getSpecType_SpecAttributes(), source, new String[] { "name", "SPEC-ATTRIBUTES", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(reqIFContentEClass, source, new String[] { "name", "REQ-IF-CONTENT", "kind", "elementOnly" });
-		addAnnotation(getReqIFContent_Datatypes(), source, new String[] { "name", "DATATYPES", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(getReqIFContent_SpecTypes(), source, new String[] { "name", "SPEC-TYPES", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(getReqIFContent_SpecObjects(), source, new String[] { "name", "SPEC-OBJECTS", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(getReqIFContent_SpecRelations(), source, new String[] { "name", "SPEC-RELATIONS", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(getReqIFContent_Specifications(), source, new String[] { "name", "SPECIFICATIONS", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(getReqIFContent_SpecRelationGroups(), source, new String[] { "name", "SPEC-RELATION-GROUPS", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(reqIFEClass, source, new String[] { "name", "REQ-IF", "kind", "elementOnly" });
-		addAnnotation(getReqIF_Lang(), source, new String[] { "name", "lang", "kind", "attribute", "namespace",
-				"http://www.w3.org/XML/1998/namespace" });
-		addAnnotation(getReqIF_TheHeader(), source, new String[] { "name", "THE-HEADER", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(getReqIF_CoreContent(), source, new String[] { "name", "CORE-CONTENT", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(getReqIF_ToolExtensions(), source, new String[] { "name", "TOOL-EXTENSIONS", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(reqIFHeaderEClass, source, new String[] { "name", "REQ-IF-HEADER", "kind", "elementOnly" });
-		addAnnotation(getReqIFHeader_Comment(), source, new String[] { "name", "COMMENT", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(getReqIFHeader_CreationTime(), source, new String[] { "name", "CREATION-TIME", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(getReqIFHeader_Identifier(), source, new String[] { "name", "IDENTIFIER", "kind", "attribute" });
-		addAnnotation(getReqIFHeader_RepositoryId(), source, new String[] { "name", "REPOSITORY-ID", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(getReqIFHeader_ReqIFToolId(), source, new String[] { "name", "REQ-IF-TOOL-ID", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(getReqIFHeader_ReqIFVersion(), source, new String[] { "name", "REQ-IF-VERSION", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(getReqIFHeader_SourceToolId(), source, new String[] { "name", "SOURCE-TOOL-ID", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(getReqIFHeader_Title(), source, new String[] { "name", "TITLE", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(reqIFToolExtensionEClass, source, new String[] { "name", "REQ-IF-TOOL-EXTENSION", "kind", "elementOnly" });
-		addAnnotation(getReqIFToolExtension_Extensions(), source, new String[] { "name", "EXTENSIONS", "kind", "elementWildcard", "namespace",
-				"##targetNamespace", "precessing", "lax", "wildcards", "##other" });
-		addAnnotation(specObjectEClass, source, new String[] { "name", "SPEC-OBJECT", "kind", "elementOnly" });
-		addAnnotation(getSpecObject_Type(), source, new String[] { "name", "TYPE", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(specObjectTypeEClass, source, new String[] { "name", "SPEC-OBJECT-TYPE", "kind", "elementOnly" });
-		addAnnotation(specificationEClass, source, new String[] { "name", "SPECIFICATION", "kind", "elementOnly" });
-		addAnnotation(getSpecification_Type(), source, new String[] { "name", "TYPE", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(getSpecification_Children(), source, new String[] { "name", "CHILDREN", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(specificationTypeEClass, source, new String[] { "name", "SPECIFICATION-TYPE", "kind", "elementOnly" });
-		addAnnotation(specHierarchyEClass, source, new String[] { "name", "SPEC-HIERARCHY", "kind", "elementOnly" });
-		addAnnotation(getSpecHierarchy_TableInternal(), source, new String[] { "name", "IS-TABLE-INTERNAL", "kind", "attribute" });
-		addAnnotation(getSpecHierarchy_Object(), source, new String[] { "name", "OBJECT", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(getSpecHierarchy_Children(), source, new String[] { "name", "CHILDREN", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(getSpecHierarchy_EditableAtts(), source, new String[] { "name", "EDITABLE-ATTS", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(datatypeDefinitionEClass, source, new String[] { "name", "DATATYPE-DEFINITION", "kind", "elementOnly" });
-		addAnnotation(specRelationEClass, source, new String[] { "name", "SPEC-RELATION", "kind", "elementOnly" });
-		addAnnotation(getSpecRelation_Target(), source, new String[] { "name", "TARGET", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(getSpecRelation_Source(), source, new String[] { "name", "SOURCE", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(getSpecRelation_Type(), source, new String[] { "name", "TYPE", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(specRelationTypeEClass, source, new String[] { "name", "SPEC-RELATION-TYPE", "kind", "elementOnly" });
-		addAnnotation(relationGroupEClass, source, new String[] { "name", "RELATION-GROUP", "kind", "elementOnly" });
-		addAnnotation(getRelationGroup_SpecRelations(), source, new String[] { "name", "SPEC-RELATIONS", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(getRelationGroup_Type(), source, new String[] { "name", "TYPE", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(getRelationGroup_SourceSpecification(), source, new String[] { "name", "SOURCE-SPECIFICATION", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(getRelationGroup_TargetSpecification(), source, new String[] { "name", "TARGET-SPECIFICATION", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(relationGroupTypeEClass, source, new String[] { "name", "RELATION-GROUP-TYPE", "kind", "elementOnly" });
-		addAnnotation(datatypeDefinitionXHTMLEClass, source, new String[] { "name", "DATATYPE-DEFINITION-XHTML", "kind", "elementOnly" });
-		addAnnotation(alternativeIDEClass, source, new String[] { "name", "ALTERNATIVE-ID", "kind", "elementOnly" });
-		addAnnotation(getAlternativeID_Identifier(), source, new String[] { "name", "IDENTIFIER", "kind", "attribute" });
-		addAnnotation(attributeDefinitionBooleanEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION-BOOLEAN", "kind", "elementOnly" });
-		addAnnotation(getAttributeDefinitionBoolean_Type(), source, new String[] { "name", "TYPE", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(getAttributeDefinitionBoolean_DefaultValue(), source, new String[] { "name", "DEFAULT-VALUE", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(attributeDefinitionSimpleEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION-SIMPLE", "kind", "elementOnly" });
-		addAnnotation(datatypeDefinitionBooleanEClass, source, new String[] { "name", "DATATYPE-DEFINITION-BOOLEAN", "kind", "elementOnly" });
-		addAnnotation(datatypeDefinitionSimpleEClass, source, new String[] { "name", "DATATYPE-DEFINITION-SIMPLE", "kind", "elementOnly" });
-		addAnnotation(attributeValueBooleanEClass, source, new String[] { "name", "ATTRIBUTE-VALUE-BOOLEAN", "kind", "elementOnly" });
-		addAnnotation(getAttributeValueBoolean_TheValue(), source, new String[] { "name", "THE-VALUE", "kind", "attribute" });
-		addAnnotation(getAttributeValueBoolean_Definition(), source, new String[] { "name", "DEFINITION", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(attributeValueSimpleEClass, source, new String[] { "name", "ATTRIBUTE-VALUE-SIMPLE", "kind", "elementOnly" });
-		addAnnotation(attributeDefinitionDateEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION-DATE", "kind", "elementOnly" });
-		addAnnotation(getAttributeDefinitionDate_Type(), source, new String[] { "name", "TYPE", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(getAttributeDefinitionDate_DefaultValue(), source, new String[] { "name", "DEFAULT-VALUE", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(datatypeDefinitionDateEClass, source, new String[] { "name", "DATATYPE-DEFINITION-DATE", "kind", "elementOnly" });
-		addAnnotation(attributeValueDateEClass, source, new String[] { "name", "ATTRIBUTE-VALUE-DATE", "kind", "elementOnly" });
-		addAnnotation(getAttributeValueDate_TheValue(), source, new String[] { "name", "THE-VALUE", "kind", "attribute" });
-		addAnnotation(getAttributeValueDate_Definition(), source, new String[] { "name", "DEFINITION", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(attributeDefinitionEnumerationEClass, source,
-				new String[] { "name", "ATTRIBUTE-DEFINITION-ENUMERATION", "kind", "elementOnly" });
-		addAnnotation(getAttributeDefinitionEnumeration_MultiValued(), source, new String[] { "name", "MULTI-VALUED", "kind", "attribute" });
-		addAnnotation(getAttributeDefinitionEnumeration_Type(), source, new String[] { "name", "TYPE", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(getAttributeDefinitionEnumeration_DefaultValue(), source, new String[] { "name", "DEFAULT-VALUE", "kind", "element",
-				"namespace", "##targetNamespace" });
-		addAnnotation(datatypeDefinitionEnumerationEClass, source, new String[] { "name", "DATATYPE-DEFINITION-ENUMERATION", "kind", "elementOnly" });
-		addAnnotation(getDatatypeDefinitionEnumeration_SpecifiedValues(), source, new String[] { "name", "SPECIFIED-VALUES", "kind", "element",
-				"namespace", "##targetNamespace" });
-		addAnnotation(enumValueEClass, source, new String[] { "name", "ENUM-VALUE", "kind", "elementOnly" });
-		addAnnotation(getEnumValue_Properties(), source, new String[] { "name", "PROPERTIES", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(embeddedValueEClass, source, new String[] { "name", "EMBEDDED-VALUE", "kind", "elementOnly" });
-		addAnnotation(getEmbeddedValue_Key(), source, new String[] { "name", "KEY", "kind", "attribute" });
-		addAnnotation(getEmbeddedValue_OtherContent(), source, new String[] { "name", "OTHER-CONTENT", "kind", "attribute" });
-		addAnnotation(attributeValueEnumerationEClass, source, new String[] { "name", "ATTRIBUTE-VALUE-ENUMERATION", "kind", "elementOnly" });
-		addAnnotation(getAttributeValueEnumeration_Values(), source, new String[] { "name", "VALUES", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(getAttributeValueEnumeration_Definition(), source, new String[] { "name", "DEFINITION", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(attributeDefinitionIntegerEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION-INTEGER", "kind", "elementOnly" });
-		addAnnotation(getAttributeDefinitionInteger_Type(), source, new String[] { "name", "TYPE", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(getAttributeDefinitionInteger_DefaultValue(), source, new String[] { "name", "DEFAULT-VALUE", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(datatypeDefinitionIntegerEClass, source, new String[] { "name", "DATATYPE-DEFINITION-INTEGER", "kind", "elementOnly" });
-		addAnnotation(getDatatypeDefinitionInteger_Max(), source, new String[] { "name", "MAX", "kind", "attribute" });
-		addAnnotation(getDatatypeDefinitionInteger_Min(), source, new String[] { "name", "MIN", "kind", "attribute" });
-		addAnnotation(attributeValueIntegerEClass, source, new String[] { "name", "ATTRIBUTE-VALUE-INTEGER", "kind", "elementOnly" });
-		addAnnotation(getAttributeValueInteger_TheValue(), source, new String[] { "name", "THE-VALUE", "kind", "attribute" });
-		addAnnotation(getAttributeValueInteger_Definition(), source, new String[] { "name", "DEFINITION", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(attributeDefinitionRealEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION-REAL", "kind", "elementOnly" });
-		addAnnotation(getAttributeDefinitionReal_Type(), source, new String[] { "name", "TYPE", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(getAttributeDefinitionReal_DefaultValue(), source, new String[] { "name", "DEFAULT-VALUE", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(datatypeDefinitionRealEClass, source, new String[] { "name", "DATATYPE-DEFINITION-REAL", "kind", "elementOnly" });
-		addAnnotation(getDatatypeDefinitionReal_Accuracy(), source, new String[] { "name", "ACCURACY", "kind", "attribute" });
-		addAnnotation(getDatatypeDefinitionReal_Max(), source, new String[] { "name", "MAX", "kind", "attribute" });
-		addAnnotation(getDatatypeDefinitionReal_Min(), source, new String[] { "name", "MIN", "kind", "attribute" });
-		addAnnotation(attributeValueRealEClass, source, new String[] { "name", "ATTRIBUTE-VALUE-REAL", "kind", "elementOnly" });
-		addAnnotation(getAttributeValueReal_TheValue(), source, new String[] { "name", "THE-VALUE", "kind", "attribute" });
-		addAnnotation(getAttributeValueReal_Definition(), source, new String[] { "name", "DEFINITION", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(attributeDefinitionStringEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION-STRING", "kind", "elementOnly" });
-		addAnnotation(getAttributeDefinitionString_Type(), source,
-				new String[] { "name", "TYPE", "kind", "element", "namespace", "##targetNamespace" });
-		addAnnotation(getAttributeDefinitionString_DefaultValue(), source, new String[] { "name", "DEFAULT-VALUE", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(datatypeDefinitionStringEClass, source, new String[] { "name", "DATATYPE-DEFINITION-STRING", "kind", "elementOnly" });
-		addAnnotation(getDatatypeDefinitionString_MaxLength(), source, new String[] { "name", "MAX-LENGTH", "kind", "attribute" });
-		addAnnotation(attributeValueStringEClass, source, new String[] { "name", "ATTRIBUTE-VALUE-STRING", "kind", "elementOnly" });
-		addAnnotation(getAttributeValueString_TheValue(), source, new String[] { "name", "THE-VALUE", "kind", "attribute" });
-		addAnnotation(getAttributeValueString_Definition(), source, new String[] { "name", "DEFINITION", "kind", "element", "namespace",
-				"##targetNamespace" });
-		addAnnotation(xhtmlContentEClass, source, new String[] { "name", "XHTML-CONTENT", "kind", "elementOnly" });
-		addAnnotation(getXhtmlContent_Xhtml(), source, new String[] { "name", "XHTML", "kind", "elementWildcard", "namespace", "##targetNamespace",
-				"precessing", "lax", "wildcards", "http://www.w3.org/1999/xhtml" });
-		addAnnotation(getXhtmlContent_XhtmlSource(), source, new String[] { "name", "XHTML-SOURCE", "kind", "element", "namespace",
-				"##targetNamespace" });
+		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$		
+		addAnnotation(accessControlledElementEClass, source, new String[] { "name", "ACCESS-CONTROLLED-ELEMENT", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAccessControlledElement_Editable(), source, new String[] { "name", "IS-EDITABLE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(identifiableEClass, source, new String[] { "name", "IDENTIFIABLE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getIdentifiable_Desc(), source, new String[] { "name", "DESC", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getIdentifiable_Identifier(), source, new String[] { "name", "IDENTIFIER", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getIdentifiable_LastChange(), source, new String[] { "name", "LAST-CHANGE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getIdentifiable_LongName(), source, new String[] { "name", "LONG-NAME", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getIdentifiable_AlternativeID(), source, new String[] { "name", "ALTERNATIVE-ID", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueXHTMLEClass, source, new String[] { "name", "ATTRIBUTE-VALUE-XHTML", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueXHTML_Simplified(), source, new String[] { "name", "IS-SIMPLIFIED", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueXHTML_Definition(), source, new String[] { "name", "DEFINITION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueXHTML_TheOriginalValue(), source, new String[] { "name", "THE-ORIGINAL-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueXHTML_TheValue(), source, new String[] { "name", "THE-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueEClass, source, new String[] { "name", "ATTRIBUTE-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specElementWithAttributesEClass, source, new String[] { "name", "SPEC-ELEMENT-WITH-ATTRIBUTES", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecElementWithAttributes_Values(), source, new String[] { "name", "VALUES", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionXHTMLEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION-XHTML", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionXHTML_Type(), source, new String[] { "name", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionXHTML_DefaultValue(), source, new String[] { "name", "DEFAULT-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specTypeEClass, source, new String[] { "name", "SPEC-TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecType_SpecAttributes(), source, new String[] { "name", "SPEC-ATTRIBUTES", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(reqIFContentEClass, source, new String[] { "name", "REQ-IF-CONTENT", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFContent_Datatypes(), source, new String[] { "name", "DATATYPES", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFContent_SpecTypes(), source, new String[] { "name", "SPEC-TYPES", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFContent_SpecObjects(), source, new String[] { "name", "SPEC-OBJECTS", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFContent_SpecRelations(), source, new String[] { "name", "SPEC-RELATIONS", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFContent_Specifications(), source, new String[] { "name", "SPECIFICATIONS", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFContent_SpecRelationGroups(), source, new String[] { "name", "SPEC-RELATION-GROUPS", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(reqIFEClass, source, new String[] { "name", "REQ-IF", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIF_Lang(), source, new String[] { "name", "lang", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "http://www.w3.org/XML/1998/namespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIF_TheHeader(), source, new String[] { "name", "THE-HEADER", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIF_CoreContent(), source, new String[] { "name", "CORE-CONTENT", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIF_ToolExtensions(), source, new String[] { "name", "TOOL-EXTENSIONS", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(reqIFHeaderEClass, source, new String[] { "name", "REQ-IF-HEADER", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFHeader_Comment(), source, new String[] { "name", "COMMENT", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFHeader_CreationTime(), source, new String[] { "name", "CREATION-TIME", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFHeader_Identifier(), source, new String[] { "name", "IDENTIFIER", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFHeader_RepositoryId(), source, new String[] { "name", "REPOSITORY-ID", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFHeader_ReqIFToolId(), source, new String[] { "name", "REQ-IF-TOOL-ID", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFHeader_ReqIFVersion(), source, new String[] { "name", "REQ-IF-VERSION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFHeader_SourceToolId(), source, new String[] { "name", "SOURCE-TOOL-ID", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFHeader_Title(), source, new String[] { "name", "TITLE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(reqIFToolExtensionEClass, source, new String[] { "name", "REQ-IF-TOOL-EXTENSION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFToolExtension_Extensions(), source, new String[] { "name", "EXTENSIONS", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
+				"precessing", "lax", //$NON-NLS-1$ //$NON-NLS-2$
+				"wildcards", "##other" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specObjectEClass, source, new String[] { "name", "SPEC-OBJECT", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecObject_Type(), source, new String[] { "name", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specObjectTypeEClass, source, new String[] { "name", "SPEC-OBJECT-TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specificationEClass, source, new String[] { "name", "SPECIFICATION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecification_Type(), source, new String[] { "name", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecification_Children(), source, new String[] { "name", "CHILDREN", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specificationTypeEClass, source, new String[] { "name", "SPECIFICATION-TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specHierarchyEClass, source, new String[] { "name", "SPEC-HIERARCHY", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecHierarchy_TableInternal(), source, new String[] { "name", "IS-TABLE-INTERNAL", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecHierarchy_Object(), source, new String[] { "name", "OBJECT", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecHierarchy_Children(), source, new String[] { "name", "CHILDREN", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecHierarchy_EditableAtts(), source, new String[] { "name", "EDITABLE-ATTS", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionEClass, source, new String[] { "name", "DATATYPE-DEFINITION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specRelationEClass, source, new String[] { "name", "SPEC-RELATION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecRelation_Target(), source, new String[] { "name", "TARGET", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecRelation_Source(), source, new String[] { "name", "SOURCE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecRelation_Type(), source, new String[] { "name", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specRelationTypeEClass, source, new String[] { "name", "SPEC-RELATION-TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(relationGroupEClass, source, new String[] { "name", "RELATION-GROUP", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getRelationGroup_SpecRelations(), source, new String[] { "name", "SPEC-RELATIONS", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getRelationGroup_Type(), source, new String[] { "name", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getRelationGroup_SourceSpecification(), source, new String[] { "name", "SOURCE-SPECIFICATION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getRelationGroup_TargetSpecification(), source, new String[] { "name", "TARGET-SPECIFICATION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(relationGroupTypeEClass, source, new String[] { "name", "RELATION-GROUP-TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionXHTMLEClass, source, new String[] { "name", "DATATYPE-DEFINITION-XHTML", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(alternativeIDEClass, source, new String[] { "name", "ALTERNATIVE-ID", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAlternativeID_Identifier(), source, new String[] { "name", "IDENTIFIER", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionBooleanEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION-BOOLEAN", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionBoolean_Type(), source, new String[] { "name", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionBoolean_DefaultValue(), source, new String[] { "name", "DEFAULT-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionSimpleEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION-SIMPLE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionBooleanEClass, source, new String[] { "name", "DATATYPE-DEFINITION-BOOLEAN", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionSimpleEClass, source, new String[] { "name", "DATATYPE-DEFINITION-SIMPLE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueBooleanEClass, source, new String[] { "name", "ATTRIBUTE-VALUE-BOOLEAN", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueBoolean_TheValue(), source, new String[] { "name", "THE-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueBoolean_Definition(), source, new String[] { "name", "DEFINITION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueSimpleEClass, source, new String[] { "name", "ATTRIBUTE-VALUE-SIMPLE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionDateEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION-DATE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionDate_Type(), source, new String[] { "name", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionDate_DefaultValue(), source, new String[] { "name", "DEFAULT-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionDateEClass, source, new String[] { "name", "DATATYPE-DEFINITION-DATE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueDateEClass, source, new String[] { "name", "ATTRIBUTE-VALUE-DATE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueDate_TheValue(), source, new String[] { "name", "THE-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueDate_Definition(), source, new String[] { "name", "DEFINITION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionEnumerationEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION-ENUMERATION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionEnumeration_MultiValued(), source, new String[] { "name", "MULTI-VALUED", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionEnumeration_Type(), source, new String[] { "name", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionEnumeration_DefaultValue(), source, new String[] { "name", "DEFAULT-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionEnumerationEClass, source, new String[] { "name", "DATATYPE-DEFINITION-ENUMERATION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getDatatypeDefinitionEnumeration_SpecifiedValues(), source, new String[] { "name", "SPECIFIED-VALUES", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(enumValueEClass, source, new String[] { "name", "ENUM-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getEnumValue_Properties(), source, new String[] { "name", "PROPERTIES", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(embeddedValueEClass, source, new String[] { "name", "EMBEDDED-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getEmbeddedValue_Key(), source, new String[] { "name", "KEY", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getEmbeddedValue_OtherContent(), source, new String[] { "name", "OTHER-CONTENT", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueEnumerationEClass, source, new String[] { "name", "ATTRIBUTE-VALUE-ENUMERATION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueEnumeration_Values(), source, new String[] { "name", "VALUES", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueEnumeration_Definition(), source, new String[] { "name", "DEFINITION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionIntegerEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION-INTEGER", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionInteger_Type(), source, new String[] { "name", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionInteger_DefaultValue(), source, new String[] { "name", "DEFAULT-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionIntegerEClass, source, new String[] { "name", "DATATYPE-DEFINITION-INTEGER", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getDatatypeDefinitionInteger_Max(), source, new String[] { "name", "MAX", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getDatatypeDefinitionInteger_Min(), source, new String[] { "name", "MIN", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueIntegerEClass, source, new String[] { "name", "ATTRIBUTE-VALUE-INTEGER", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueInteger_TheValue(), source, new String[] { "name", "THE-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueInteger_Definition(), source, new String[] { "name", "DEFINITION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionRealEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION-REAL", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionReal_Type(), source, new String[] { "name", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionReal_DefaultValue(), source, new String[] { "name", "DEFAULT-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionRealEClass, source, new String[] { "name", "DATATYPE-DEFINITION-REAL", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getDatatypeDefinitionReal_Accuracy(), source, new String[] { "name", "ACCURACY", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getDatatypeDefinitionReal_Max(), source, new String[] { "name", "MAX", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getDatatypeDefinitionReal_Min(), source, new String[] { "name", "MIN", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueRealEClass, source, new String[] { "name", "ATTRIBUTE-VALUE-REAL", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueReal_TheValue(), source, new String[] { "name", "THE-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueReal_Definition(), source, new String[] { "name", "DEFINITION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionStringEClass, source, new String[] { "name", "ATTRIBUTE-DEFINITION-STRING", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionString_Type(), source, new String[] { "name", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionString_DefaultValue(), source, new String[] { "name", "DEFAULT-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionStringEClass, source, new String[] { "name", "DATATYPE-DEFINITION-STRING", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getDatatypeDefinitionString_MaxLength(), source, new String[] { "name", "MAX-LENGTH", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueStringEClass, source, new String[] { "name", "ATTRIBUTE-VALUE-STRING", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueString_TheValue(), source, new String[] { "name", "THE-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueString_Definition(), source, new String[] { "name", "DEFINITION", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(xhtmlContentEClass, source, new String[] { "name", "XHTML-CONTENT", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getXhtmlContent_Xhtml(), source, new String[] { "name", "XHTML", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
+				"precessing", "lax", //$NON-NLS-1$ //$NON-NLS-2$
+				"wildcards", "http://www.w3.org/1999/xhtml" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getXhtmlContent_XhtmlSource(), source, new String[] { "name", "XHTML-SOURCE", //$NON-NLS-1$ //$NON-NLS-2$
+				"kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+				"namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		});
 	}
 
 	/**
@@ -2512,223 +3002,633 @@
 	 * @generated
 	 */
 	protected void createXMLPersistenceMappingExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData";
-		addAnnotation(accessControlledElementEClass, source, new String[] { "wrapperName", "ACCESS-CONTROLLED-ELEMENT" });
-		addAnnotation(getAccessControlledElement_Editable(), source, new String[] { "wrapperName", "IS-EDITABLE", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(identifiableEClass, source, new String[] { "wrapperName", "IDENTIFIABLE" });
-		addAnnotation(getIdentifiable_Desc(), source, new String[] { "wrapperName", "DESC", "featureWrapperElement", "false", "featureElement",
-				"true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getIdentifiable_Identifier(), source, new String[] { "wrapperName", "IDENTIFIER", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getIdentifiable_LastChange(), source, new String[] { "wrapperName", "LAST-CHANGE", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getIdentifiable_LongName(), source, new String[] { "wrapperName", "LONG-NAME", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getIdentifiable_AlternativeID(), source, new String[] { "wrapperName", "ALTERNATIVE-ID", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(attributeValueXHTMLEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE-XHTML" });
-		addAnnotation(getAttributeValueXHTML_Simplified(), source, new String[] { "wrapperName", "IS-SIMPLIFIED", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getAttributeValueXHTML_Definition(), source, new String[] { "wrapperName", "DEFINITION", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(getAttributeValueXHTML_TheOriginalValue(), source, new String[] { "wrapperName", "THE-ORIGINAL-VALUE", "featureWrapperElement",
-				"false", "featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getAttributeValueXHTML_TheValue(), source, new String[] { "wrapperName", "THE-VALUE", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(attributeValueEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE" });
-		addAnnotation(specElementWithAttributesEClass, source, new String[] { "wrapperName", "SPEC-ELEMENT-WITH-ATTRIBUTES" });
-		addAnnotation(getSpecElementWithAttributes_Values(), source, new String[] { "wrapperName", "VALUES", "featureWrapperElement", "true",
-				"featureElement", "false", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(attributeDefinitionXHTMLEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION-XHTML" });
-		addAnnotation(getAttributeDefinitionXHTML_Type(), source, new String[] { "wrapperName", "TYPE", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(getAttributeDefinitionXHTML_DefaultValue(), source, new String[] { "wrapperName", "DEFAULT-VALUE", "featureWrapperElement",
-				"false", "featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(attributeDefinitionEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION" });
-		addAnnotation(specTypeEClass, source, new String[] { "wrapperName", "SPEC-TYPE" });
-		addAnnotation(getSpecType_SpecAttributes(), source, new String[] { "wrapperName", "SPEC-ATTRIBUTES", "featureWrapperElement", "true",
-				"featureElement", "false", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(reqIFContentEClass, source, new String[] { "wrapperName", "REQ-IF-CONTENT" });
-		addAnnotation(getReqIFContent_Datatypes(), source, new String[] { "wrapperName", "DATATYPES", "featureWrapperElement", "true",
-				"featureElement", "false", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(getReqIFContent_SpecTypes(), source, new String[] { "wrapperName", "SPEC-TYPES", "featureWrapperElement", "true",
-				"featureElement", "false", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(getReqIFContent_SpecObjects(), source, new String[] { "wrapperName", "SPEC-OBJECTS", "featureWrapperElement", "true",
-				"featureElement", "false", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(getReqIFContent_SpecRelations(), source, new String[] { "wrapperName", "SPEC-RELATIONS", "featureWrapperElement", "true",
-				"featureElement", "false", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(getReqIFContent_Specifications(), source, new String[] { "wrapperName", "SPECIFICATIONS", "featureWrapperElement", "true",
-				"featureElement", "false", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(getReqIFContent_SpecRelationGroups(), source, new String[] { "wrapperName", "SPEC-RELATION-GROUPS", "featureWrapperElement",
-				"true", "featureElement", "false", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(reqIFEClass, source, new String[] { "wrapperName", "REQ-IF" });
-		addAnnotation(getReqIF_TheHeader(), source, new String[] { "wrapperName", "THE-HEADER", "featureWrapperElement", "false", "featureElement",
-				"true", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(getReqIF_CoreContent(), source, new String[] { "wrapperName", "CORE-CONTENT", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(getReqIF_ToolExtensions(), source, new String[] { "wrapperName", "TOOL-EXTENSIONS", "featureWrapperElement", "true",
-				"featureElement", "false", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(reqIFHeaderEClass, source, new String[] { "wrapperName", "REQ-IF-HEADER" });
-		addAnnotation(getReqIFHeader_Comment(), source, new String[] { "wrapperName", "COMMENT", "featureWrapperElement", "false", "featureElement",
-				"true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getReqIFHeader_CreationTime(), source, new String[] { "wrapperName", "CREATION-TIME", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getReqIFHeader_Identifier(), source, new String[] { "wrapperName", "IDENTIFIER", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getReqIFHeader_RepositoryId(), source, new String[] { "wrapperName", "REPOSITORY-ID", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getReqIFHeader_ReqIFToolId(), source, new String[] { "wrapperName", "REQ-IF-TOOL-ID", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getReqIFHeader_ReqIFVersion(), source, new String[] { "wrapperName", "REQ-IF-VERSION", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getReqIFHeader_SourceToolId(), source, new String[] { "wrapperName", "SOURCE-TOOL-ID", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getReqIFHeader_Title(), source, new String[] { "wrapperName", "TITLE", "featureWrapperElement", "false", "featureElement",
-				"true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(reqIFToolExtensionEClass, source, new String[] { "wrapperName", "REQ-IF-TOOL-EXTENSION" });
-		addAnnotation(getReqIFToolExtension_Extensions(), source, new String[] { "wrapperName", "EXTENSIONS", "featureWrapperElement", "false",
-				"featureElement", "false", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(specObjectEClass, source, new String[] { "wrapperName", "SPEC-OBJECT" });
-		addAnnotation(getSpecObject_Type(), source, new String[] { "wrapperName", "TYPE", "featureWrapperElement", "false", "featureElement", "true",
-				"classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(specObjectTypeEClass, source, new String[] { "wrapperName", "SPEC-OBJECT-TYPE" });
-		addAnnotation(specificationEClass, source, new String[] { "wrapperName", "SPECIFICATION" });
-		addAnnotation(getSpecification_Type(), source, new String[] { "wrapperName", "TYPE", "featureWrapperElement", "false", "featureElement",
-				"true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(getSpecification_Children(), source, new String[] { "wrapperName", "CHILDREN", "featureWrapperElement", "true",
-				"featureElement", "false", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(specificationTypeEClass, source, new String[] { "wrapperName", "SPECIFICATION-TYPE" });
-		addAnnotation(specHierarchyEClass, source, new String[] { "wrapperName", "SPEC-HIERARCHY" });
-		addAnnotation(getSpecHierarchy_TableInternal(), source, new String[] { "wrapperName", "IS-TABLE-INTERNAL", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getSpecHierarchy_Object(), source, new String[] { "wrapperName", "OBJECT", "featureWrapperElement", "false", "featureElement",
-				"true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(getSpecHierarchy_Children(), source, new String[] { "wrapperName", "CHILDREN", "featureWrapperElement", "true",
-				"featureElement", "false", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(getSpecHierarchy_EditableAtts(), source, new String[] { "wrapperName", "EDITABLE-ATTS", "featureWrapperElement", "true",
-				"featureElement", "false", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(datatypeDefinitionEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION" });
-		addAnnotation(specRelationEClass, source, new String[] { "wrapperName", "SPEC-RELATION" });
-		addAnnotation(getSpecRelation_Target(), source, new String[] { "wrapperName", "TARGET", "featureWrapperElement", "false", "featureElement",
-				"true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(getSpecRelation_Source(), source, new String[] { "wrapperName", "SOURCE", "featureWrapperElement", "false", "featureElement",
-				"true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(getSpecRelation_Type(), source, new String[] { "wrapperName", "TYPE", "featureWrapperElement", "false", "featureElement",
-				"true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(specRelationTypeEClass, source, new String[] { "wrapperName", "SPEC-RELATION-TYPE" });
-		addAnnotation(relationGroupEClass, source, new String[] { "wrapperName", "RELATION-GROUP" });
-		addAnnotation(getRelationGroup_SpecRelations(), source, new String[] { "wrapperName", "SPEC-RELATIONS", "featureWrapperElement", "true",
-				"featureElement", "false", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(getRelationGroup_Type(), source, new String[] { "wrapperName", "TYPE", "featureWrapperElement", "false", "featureElement",
-				"true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(getRelationGroup_SourceSpecification(), source, new String[] { "wrapperName", "SOURCE-SPECIFICATION", "featureWrapperElement",
-				"false", "featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(getRelationGroup_TargetSpecification(), source, new String[] { "wrapperName", "TARGET-SPECIFICATION", "featureWrapperElement",
-				"false", "featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(relationGroupTypeEClass, source, new String[] { "wrapperName", "RELATION-GROUP-TYPE" });
-		addAnnotation(datatypeDefinitionXHTMLEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION-XHTML" });
-		addAnnotation(alternativeIDEClass, source, new String[] { "wrapperName", "ALTERNATIVE-ID" });
-		addAnnotation(getAlternativeID_Identifier(), source, new String[] { "wrapperName", "IDENTIFIER", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(attributeDefinitionBooleanEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION-BOOLEAN" });
-		addAnnotation(getAttributeDefinitionBoolean_Type(), source, new String[] { "wrapperName", "TYPE", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(getAttributeDefinitionBoolean_DefaultValue(), source, new String[] { "wrapperName", "DEFAULT-VALUE", "featureWrapperElement",
-				"false", "featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(attributeDefinitionSimpleEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION-SIMPLE" });
-		addAnnotation(datatypeDefinitionBooleanEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION-BOOLEAN" });
-		addAnnotation(datatypeDefinitionSimpleEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION-SIMPLE" });
-		addAnnotation(attributeValueBooleanEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE-BOOLEAN" });
-		addAnnotation(getAttributeValueBoolean_TheValue(), source, new String[] { "wrapperName", "THE-VALUE", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getAttributeValueBoolean_Definition(), source, new String[] { "wrapperName", "DEFINITION", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(attributeValueSimpleEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE-SIMPLE" });
-		addAnnotation(attributeDefinitionDateEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION-DATE" });
-		addAnnotation(getAttributeDefinitionDate_Type(), source, new String[] { "wrapperName", "TYPE", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(getAttributeDefinitionDate_DefaultValue(), source, new String[] { "wrapperName", "DEFAULT-VALUE", "featureWrapperElement",
-				"false", "featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(datatypeDefinitionDateEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION-DATE" });
-		addAnnotation(attributeValueDateEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE-DATE" });
-		addAnnotation(getAttributeValueDate_TheValue(), source, new String[] { "wrapperName", "THE-VALUE", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getAttributeValueDate_Definition(), source, new String[] { "wrapperName", "DEFINITION", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(attributeDefinitionEnumerationEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION-ENUMERATION" });
-		addAnnotation(getAttributeDefinitionEnumeration_MultiValued(), source, new String[] { "wrapperName", "MULTI-VALUED", "featureWrapperElement",
-				"false", "featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getAttributeDefinitionEnumeration_Type(), source, new String[] { "wrapperName", "TYPE", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(getAttributeDefinitionEnumeration_DefaultValue(), source, new String[] { "wrapperName", "DEFAULT-VALUE",
-				"featureWrapperElement", "false", "featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(datatypeDefinitionEnumerationEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION-ENUMERATION" });
-		addAnnotation(getDatatypeDefinitionEnumeration_SpecifiedValues(), source, new String[] { "wrapperName", "SPECIFIED-VALUES",
-				"featureWrapperElement", "true", "featureElement", "false", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(enumValueEClass, source, new String[] { "wrapperName", "ENUM-VALUE" });
-		addAnnotation(getEnumValue_Properties(), source, new String[] { "wrapperName", "PROPERTIES", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(embeddedValueEClass, source, new String[] { "wrapperName", "EMBEDDED-VALUE" });
-		addAnnotation(getEmbeddedValue_Key(), source, new String[] { "wrapperName", "KEY", "featureWrapperElement", "false", "featureElement",
-				"true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getEmbeddedValue_OtherContent(), source, new String[] { "wrapperName", "OTHER-CONTENT", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(attributeValueEnumerationEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE-ENUMERATION" });
-		addAnnotation(getAttributeValueEnumeration_Values(), source, new String[] { "wrapperName", "VALUES", "featureWrapperElement", "true",
-				"featureElement", "false", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(getAttributeValueEnumeration_Definition(), source, new String[] { "wrapperName", "DEFINITION", "featureWrapperElement",
-				"false", "featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(attributeDefinitionIntegerEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION-INTEGER" });
-		addAnnotation(getAttributeDefinitionInteger_Type(), source, new String[] { "wrapperName", "TYPE", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(getAttributeDefinitionInteger_DefaultValue(), source, new String[] { "wrapperName", "DEFAULT-VALUE", "featureWrapperElement",
-				"false", "featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(datatypeDefinitionIntegerEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION-INTEGER" });
-		addAnnotation(getDatatypeDefinitionInteger_Max(), source, new String[] { "wrapperName", "MAX", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getDatatypeDefinitionInteger_Min(), source, new String[] { "wrapperName", "MIN", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(attributeValueIntegerEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE-INTEGER" });
-		addAnnotation(getAttributeValueInteger_TheValue(), source, new String[] { "wrapperName", "THE-VALUE", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getAttributeValueInteger_Definition(), source, new String[] { "wrapperName", "DEFINITION", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(attributeDefinitionRealEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION-REAL" });
-		addAnnotation(getAttributeDefinitionReal_Type(), source, new String[] { "wrapperName", "TYPE", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(getAttributeDefinitionReal_DefaultValue(), source, new String[] { "wrapperName", "DEFAULT-VALUE", "featureWrapperElement",
-				"false", "featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(datatypeDefinitionRealEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION-REAL" });
-		addAnnotation(getDatatypeDefinitionReal_Accuracy(), source, new String[] { "wrapperName", "ACCURACY", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getDatatypeDefinitionReal_Max(), source, new String[] { "wrapperName", "MAX", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getDatatypeDefinitionReal_Min(), source, new String[] { "wrapperName", "MIN", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(attributeValueRealEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE-REAL" });
-		addAnnotation(getAttributeValueReal_TheValue(), source, new String[] { "wrapperName", "THE-VALUE", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getAttributeValueReal_Definition(), source, new String[] { "wrapperName", "DEFINITION", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(attributeDefinitionStringEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION-STRING" });
-		addAnnotation(getAttributeDefinitionString_Type(), source, new String[] { "wrapperName", "TYPE", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(getAttributeDefinitionString_DefaultValue(), source, new String[] { "wrapperName", "DEFAULT-VALUE", "featureWrapperElement",
-				"false", "featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(datatypeDefinitionStringEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION-STRING" });
-		addAnnotation(getDatatypeDefinitionString_MaxLength(), source, new String[] { "wrapperName", "MAX-LENGTH", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(attributeValueStringEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE-STRING" });
-		addAnnotation(getAttributeValueString_TheValue(), source, new String[] { "wrapperName", "THE-VALUE", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
-		addAnnotation(getAttributeValueString_Definition(), source, new String[] { "wrapperName", "DEFINITION", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "true", "classifierNameSuffix", "-REF" });
-		addAnnotation(xhtmlContentEClass, source, new String[] { "wrapperName", "XHTML-CONTENT" });
-		addAnnotation(getXhtmlContent_Xhtml(), source, new String[] { "wrapperName", "XHTML", "featureWrapperElement", "false", "featureElement",
-				"false", "classifierWrapperElement", "false", "classifierElement", "true" });
-		addAnnotation(getXhtmlContent_XhtmlSource(), source, new String[] { "wrapperName", "XHTML-SOURCE", "featureWrapperElement", "false",
-				"featureElement", "true", "classifierWrapperElement", "false", "classifierElement", "false" });
+		String source = "http:///org/eclipse/sphinx/emf/serialization/XMLPersistenceMappingExtendedMetaData"; //$NON-NLS-1$			
+		addAnnotation(accessControlledElementEClass, source, new String[] { "wrapperName", "ACCESS-CONTROLLED-ELEMENT" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAccessControlledElement_Editable(), source, new String[] { "wrapperName", "IS-EDITABLE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(identifiableEClass, source, new String[] { "wrapperName", "IDENTIFIABLE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getIdentifiable_Desc(), source, new String[] { "wrapperName", "DESC", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getIdentifiable_Identifier(), source, new String[] { "wrapperName", "IDENTIFIER", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getIdentifiable_LastChange(), source, new String[] { "wrapperName", "LAST-CHANGE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getIdentifiable_LongName(), source, new String[] { "wrapperName", "LONG-NAME", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getIdentifiable_AlternativeID(), source, new String[] { "wrapperName", "ALTERNATIVE-ID", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueXHTMLEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE-XHTML" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueXHTML_Simplified(), source, new String[] { "wrapperName", "IS-SIMPLIFIED", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueXHTML_Definition(), source, new String[] { "wrapperName", "DEFINITION", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueXHTML_TheOriginalValue(), source, new String[] { "wrapperName", "THE-ORIGINAL-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueXHTML_TheValue(), source, new String[] { "wrapperName", "THE-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specElementWithAttributesEClass, source, new String[] { "wrapperName", "SPEC-ELEMENT-WITH-ATTRIBUTES" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecElementWithAttributes_Values(), source, new String[] { "wrapperName", "VALUES", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionXHTMLEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION-XHTML" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionXHTML_Type(), source, new String[] { "wrapperName", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionXHTML_DefaultValue(), source, new String[] { "wrapperName", "DEFAULT-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specTypeEClass, source, new String[] { "wrapperName", "SPEC-TYPE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecType_SpecAttributes(), source, new String[] { "wrapperName", "SPEC-ATTRIBUTES", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(reqIFContentEClass, source, new String[] { "wrapperName", "REQ-IF-CONTENT" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFContent_Datatypes(), source, new String[] { "wrapperName", "DATATYPES", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFContent_SpecTypes(), source, new String[] { "wrapperName", "SPEC-TYPES", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFContent_SpecObjects(), source, new String[] { "wrapperName", "SPEC-OBJECTS", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFContent_SpecRelations(), source, new String[] { "wrapperName", "SPEC-RELATIONS", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFContent_Specifications(), source, new String[] { "wrapperName", "SPECIFICATIONS", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFContent_SpecRelationGroups(), source, new String[] { "wrapperName", "SPEC-RELATION-GROUPS", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(reqIFEClass, source, new String[] { "wrapperName", "REQ-IF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIF_TheHeader(), source, new String[] { "wrapperName", "THE-HEADER", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIF_CoreContent(), source, new String[] { "wrapperName", "CORE-CONTENT", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIF_ToolExtensions(), source, new String[] { "wrapperName", "TOOL-EXTENSIONS", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(reqIFHeaderEClass, source, new String[] { "wrapperName", "REQ-IF-HEADER" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFHeader_Comment(), source, new String[] { "wrapperName", "COMMENT", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFHeader_CreationTime(), source, new String[] { "wrapperName", "CREATION-TIME", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFHeader_Identifier(), source, new String[] { "wrapperName", "IDENTIFIER", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFHeader_RepositoryId(), source, new String[] { "wrapperName", "REPOSITORY-ID", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFHeader_ReqIFToolId(), source, new String[] { "wrapperName", "REQ-IF-TOOL-ID", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFHeader_ReqIFVersion(), source, new String[] { "wrapperName", "REQ-IF-VERSION", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFHeader_SourceToolId(), source, new String[] { "wrapperName", "SOURCE-TOOL-ID", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFHeader_Title(), source, new String[] { "wrapperName", "TITLE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(reqIFToolExtensionEClass, source, new String[] { "wrapperName", "REQ-IF-TOOL-EXTENSION" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getReqIFToolExtension_Extensions(), source, new String[] { "wrapperName", "EXTENSIONS", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specObjectEClass, source, new String[] { "wrapperName", "SPEC-OBJECT" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecObject_Type(), source, new String[] { "wrapperName", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specObjectTypeEClass, source, new String[] { "wrapperName", "SPEC-OBJECT-TYPE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specificationEClass, source, new String[] { "wrapperName", "SPECIFICATION" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecification_Type(), source, new String[] { "wrapperName", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecification_Children(), source, new String[] { "wrapperName", "CHILDREN", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specificationTypeEClass, source, new String[] { "wrapperName", "SPECIFICATION-TYPE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specHierarchyEClass, source, new String[] { "wrapperName", "SPEC-HIERARCHY" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecHierarchy_TableInternal(), source, new String[] { "wrapperName", "IS-TABLE-INTERNAL", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecHierarchy_Object(), source, new String[] { "wrapperName", "OBJECT", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecHierarchy_Children(), source, new String[] { "wrapperName", "CHILDREN", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecHierarchy_EditableAtts(), source, new String[] { "wrapperName", "EDITABLE-ATTS", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specRelationEClass, source, new String[] { "wrapperName", "SPEC-RELATION" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecRelation_Target(), source, new String[] { "wrapperName", "TARGET", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecRelation_Source(), source, new String[] { "wrapperName", "SOURCE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getSpecRelation_Type(), source, new String[] { "wrapperName", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(specRelationTypeEClass, source, new String[] { "wrapperName", "SPEC-RELATION-TYPE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(relationGroupEClass, source, new String[] { "wrapperName", "RELATION-GROUP" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getRelationGroup_SpecRelations(), source, new String[] { "wrapperName", "SPEC-RELATIONS", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getRelationGroup_Type(), source, new String[] { "wrapperName", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getRelationGroup_SourceSpecification(), source, new String[] { "wrapperName", "SOURCE-SPECIFICATION", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getRelationGroup_TargetSpecification(), source, new String[] { "wrapperName", "TARGET-SPECIFICATION", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(relationGroupTypeEClass, source, new String[] { "wrapperName", "RELATION-GROUP-TYPE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionXHTMLEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION-XHTML" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(alternativeIDEClass, source, new String[] { "wrapperName", "ALTERNATIVE-ID" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAlternativeID_Identifier(), source, new String[] { "wrapperName", "IDENTIFIER", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionBooleanEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION-BOOLEAN" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionBoolean_Type(), source, new String[] { "wrapperName", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionBoolean_DefaultValue(), source, new String[] { "wrapperName", "DEFAULT-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionSimpleEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION-SIMPLE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionBooleanEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION-BOOLEAN" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionSimpleEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION-SIMPLE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueBooleanEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE-BOOLEAN" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueBoolean_TheValue(), source, new String[] { "wrapperName", "THE-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueBoolean_Definition(), source, new String[] { "wrapperName", "DEFINITION", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueSimpleEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE-SIMPLE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionDateEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION-DATE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionDate_Type(), source, new String[] { "wrapperName", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionDate_DefaultValue(), source, new String[] { "wrapperName", "DEFAULT-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionDateEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION-DATE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueDateEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE-DATE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueDate_TheValue(), source, new String[] { "wrapperName", "THE-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueDate_Definition(), source, new String[] { "wrapperName", "DEFINITION", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionEnumerationEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION-ENUMERATION" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionEnumeration_MultiValued(), source, new String[] { "wrapperName", "MULTI-VALUED", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionEnumeration_Type(), source, new String[] { "wrapperName", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionEnumeration_DefaultValue(), source, new String[] { "wrapperName", "DEFAULT-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionEnumerationEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION-ENUMERATION" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getDatatypeDefinitionEnumeration_SpecifiedValues(), source, new String[] { "wrapperName", "SPECIFIED-VALUES", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(enumValueEClass, source, new String[] { "wrapperName", "ENUM-VALUE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getEnumValue_Properties(), source, new String[] { "wrapperName", "PROPERTIES", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(embeddedValueEClass, source, new String[] { "wrapperName", "EMBEDDED-VALUE" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getEmbeddedValue_Key(), source, new String[] { "wrapperName", "KEY", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getEmbeddedValue_OtherContent(), source, new String[] { "wrapperName", "OTHER-CONTENT", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueEnumerationEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE-ENUMERATION" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueEnumeration_Values(), source, new String[] { "wrapperName", "VALUES", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueEnumeration_Definition(), source, new String[] { "wrapperName", "DEFINITION", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionIntegerEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION-INTEGER" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionInteger_Type(), source, new String[] { "wrapperName", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionInteger_DefaultValue(), source, new String[] { "wrapperName", "DEFAULT-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionIntegerEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION-INTEGER" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getDatatypeDefinitionInteger_Max(), source, new String[] { "wrapperName", "MAX", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getDatatypeDefinitionInteger_Min(), source, new String[] { "wrapperName", "MIN", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueIntegerEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE-INTEGER" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueInteger_TheValue(), source, new String[] { "wrapperName", "THE-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueInteger_Definition(), source, new String[] { "wrapperName", "DEFINITION", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionRealEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION-REAL" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionReal_Type(), source, new String[] { "wrapperName", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionReal_DefaultValue(), source, new String[] { "wrapperName", "DEFAULT-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionRealEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION-REAL" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getDatatypeDefinitionReal_Accuracy(), source, new String[] { "wrapperName", "ACCURACY", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getDatatypeDefinitionReal_Max(), source, new String[] { "wrapperName", "MAX", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getDatatypeDefinitionReal_Min(), source, new String[] { "wrapperName", "MIN", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueRealEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE-REAL" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueReal_TheValue(), source, new String[] { "wrapperName", "THE-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueReal_Definition(), source, new String[] { "wrapperName", "DEFINITION", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeDefinitionStringEClass, source, new String[] { "wrapperName", "ATTRIBUTE-DEFINITION-STRING" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionString_Type(), source, new String[] { "wrapperName", "TYPE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeDefinitionString_DefaultValue(), source, new String[] { "wrapperName", "DEFAULT-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(datatypeDefinitionStringEClass, source, new String[] { "wrapperName", "DATATYPE-DEFINITION-STRING" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getDatatypeDefinitionString_MaxLength(), source, new String[] { "wrapperName", "MAX-LENGTH", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(attributeValueStringEClass, source, new String[] { "wrapperName", "ATTRIBUTE-VALUE-STRING" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueString_TheValue(), source, new String[] { "wrapperName", "THE-VALUE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getAttributeValueString_Definition(), source, new String[] { "wrapperName", "DEFINITION", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierNameSuffix", "-REF" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(xhtmlContentEClass, source, new String[] { "wrapperName", "XHTML-CONTENT" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getXhtmlContent_Xhtml(), source, new String[] { "wrapperName", "XHTML", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		});
+		addAnnotation(getXhtmlContent_XhtmlSource(), source, new String[] { "wrapperName", "XHTML-SOURCE", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"featureElement", "true", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierWrapperElement", "false", //$NON-NLS-1$ //$NON-NLS-2$
+				"classifierElement", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		});
 	}
 
 } // ReqIF10PackageImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIFContentImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIFContentImpl.java
index 48a5d2c..90e7bb3 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIFContentImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIFContentImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,17 +14,12 @@
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.rmf.reqif10.DatatypeDefinition;
 import org.eclipse.rmf.reqif10.RelationGroup;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
@@ -35,28 +30,26 @@
 import org.eclipse.rmf.reqif10.Specification;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Req IF Content</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Req IF Content</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFContentImpl#getDatatypes <em>Datatypes</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFContentImpl#getSpecTypes <em>Spec Types</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFContentImpl#getSpecObjects <em>Spec Objects</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFContentImpl#getSpecRelations <em>Spec Relations</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFContentImpl#getSpecifications <em>Specifications</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFContentImpl#getSpecRelationGroups <em>Spec Relation Groups</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFContentImpl#getDatatypes <em>Datatypes</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFContentImpl#getSpecTypes <em>Spec Types</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFContentImpl#getSpecObjects <em>Spec Objects</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFContentImpl#getSpecRelations <em>Spec Relations</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFContentImpl#getSpecifications <em>Specifications</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFContentImpl#getSpecRelationGroups <em>Spec Relation Groups</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class ReqIFContentImpl extends EObjectImpl implements ReqIFContent {
+public class ReqIFContentImpl extends MinimalEObjectImpl implements ReqIFContent {
 	/**
-	 * The cached value of the '{@link #getDatatypes() <em>Datatypes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDatatypes() <em>Datatypes</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDatatypes()
 	 * @generated
 	 * @ordered
@@ -64,9 +57,9 @@
 	protected EList<DatatypeDefinition> datatypes;
 
 	/**
-	 * The cached value of the '{@link #getSpecTypes() <em>Spec Types</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpecTypes() <em>Spec Types</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSpecTypes()
 	 * @generated
 	 * @ordered
@@ -74,9 +67,9 @@
 	protected EList<SpecType> specTypes;
 
 	/**
-	 * The cached value of the '{@link #getSpecObjects() <em>Spec Objects</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpecObjects() <em>Spec Objects</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSpecObjects()
 	 * @generated
 	 * @ordered
@@ -84,9 +77,9 @@
 	protected EList<SpecObject> specObjects;
 
 	/**
-	 * The cached value of the '{@link #getSpecRelations() <em>Spec Relations</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpecRelations() <em>Spec Relations</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSpecRelations()
 	 * @generated
 	 * @ordered
@@ -94,9 +87,9 @@
 	protected EList<SpecRelation> specRelations;
 
 	/**
-	 * The cached value of the '{@link #getSpecifications() <em>Specifications</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpecifications() <em>Specifications</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSpecifications()
 	 * @generated
 	 * @ordered
@@ -104,9 +97,9 @@
 	protected EList<Specification> specifications;
 
 	/**
-	 * The cached value of the '{@link #getSpecRelationGroups() <em>Spec Relation Groups</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpecRelationGroups() <em>Spec Relation Groups</em>}' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSpecRelationGroups()
 	 * @generated
 	 * @ordered
@@ -114,8 +107,8 @@
 	protected EList<RelationGroup> specRelationGroups;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ReqIFContentImpl() {
@@ -123,8 +116,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -133,38 +126,41 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<DatatypeDefinition> getDatatypes() {
 		if (datatypes == null) {
-			datatypes = new EObjectContainmentEList.Unsettable<DatatypeDefinition>(DatatypeDefinition.class, this, ReqIF10Package.REQ_IF_CONTENT__DATATYPES);
+			datatypes = new EObjectContainmentEList.Unsettable<DatatypeDefinition>(DatatypeDefinition.class, this,
+					ReqIF10Package.REQ_IF_CONTENT__DATATYPES);
 		}
 		return datatypes;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetDatatypes() {
-		if (datatypes != null) ((InternalEList.Unsettable<?>)datatypes).unset();
+		if (datatypes != null) {
+			((InternalEList.Unsettable<?>) datatypes).unset();
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDatatypes() {
-		return datatypes != null && ((InternalEList.Unsettable<?>)datatypes).isSet();
+		return datatypes != null && ((InternalEList.Unsettable<?>) datatypes).isSet();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<SpecType> getSpecTypes() {
@@ -175,26 +171,28 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpecTypes() {
-		if (specTypes != null) ((InternalEList.Unsettable<?>)specTypes).unset();
+		if (specTypes != null) {
+			((InternalEList.Unsettable<?>) specTypes).unset();
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpecTypes() {
-		return specTypes != null && ((InternalEList.Unsettable<?>)specTypes).isSet();
+		return specTypes != null && ((InternalEList.Unsettable<?>) specTypes).isSet();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<SpecObject> getSpecObjects() {
@@ -205,250 +203,261 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpecObjects() {
-		if (specObjects != null) ((InternalEList.Unsettable<?>)specObjects).unset();
+		if (specObjects != null) {
+			((InternalEList.Unsettable<?>) specObjects).unset();
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpecObjects() {
-		return specObjects != null && ((InternalEList.Unsettable<?>)specObjects).isSet();
+		return specObjects != null && ((InternalEList.Unsettable<?>) specObjects).isSet();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<SpecRelation> getSpecRelations() {
 		if (specRelations == null) {
-			specRelations = new EObjectContainmentEList.Unsettable<SpecRelation>(SpecRelation.class, this, ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATIONS);
+			specRelations = new EObjectContainmentEList.Unsettable<SpecRelation>(SpecRelation.class, this,
+					ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATIONS);
 		}
 		return specRelations;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpecRelations() {
-		if (specRelations != null) ((InternalEList.Unsettable<?>)specRelations).unset();
+		if (specRelations != null) {
+			((InternalEList.Unsettable<?>) specRelations).unset();
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpecRelations() {
-		return specRelations != null && ((InternalEList.Unsettable<?>)specRelations).isSet();
+		return specRelations != null && ((InternalEList.Unsettable<?>) specRelations).isSet();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Specification> getSpecifications() {
 		if (specifications == null) {
-			specifications = new EObjectContainmentEList.Unsettable<Specification>(Specification.class, this, ReqIF10Package.REQ_IF_CONTENT__SPECIFICATIONS);
+			specifications = new EObjectContainmentEList.Unsettable<Specification>(Specification.class, this,
+					ReqIF10Package.REQ_IF_CONTENT__SPECIFICATIONS);
 		}
 		return specifications;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpecifications() {
-		if (specifications != null) ((InternalEList.Unsettable<?>)specifications).unset();
+		if (specifications != null) {
+			((InternalEList.Unsettable<?>) specifications).unset();
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpecifications() {
-		return specifications != null && ((InternalEList.Unsettable<?>)specifications).isSet();
+		return specifications != null && ((InternalEList.Unsettable<?>) specifications).isSet();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<RelationGroup> getSpecRelationGroups() {
 		if (specRelationGroups == null) {
-			specRelationGroups = new EObjectContainmentEList.Unsettable<RelationGroup>(RelationGroup.class, this, ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATION_GROUPS);
+			specRelationGroups = new EObjectContainmentEList.Unsettable<RelationGroup>(RelationGroup.class, this,
+					ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATION_GROUPS);
 		}
 		return specRelationGroups;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpecRelationGroups() {
-		if (specRelationGroups != null) ((InternalEList.Unsettable<?>)specRelationGroups).unset();
+		if (specRelationGroups != null) {
+			((InternalEList.Unsettable<?>) specRelationGroups).unset();
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpecRelationGroups() {
-		return specRelationGroups != null && ((InternalEList.Unsettable<?>)specRelationGroups).isSet();
+		return specRelationGroups != null && ((InternalEList.Unsettable<?>) specRelationGroups).isSet();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF_CONTENT__DATATYPES:
-				return ((InternalEList<?>)getDatatypes()).basicRemove(otherEnd, msgs);
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_TYPES:
-				return ((InternalEList<?>)getSpecTypes()).basicRemove(otherEnd, msgs);
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_OBJECTS:
-				return ((InternalEList<?>)getSpecObjects()).basicRemove(otherEnd, msgs);
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATIONS:
-				return ((InternalEList<?>)getSpecRelations()).basicRemove(otherEnd, msgs);
-			case ReqIF10Package.REQ_IF_CONTENT__SPECIFICATIONS:
-				return ((InternalEList<?>)getSpecifications()).basicRemove(otherEnd, msgs);
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATION_GROUPS:
-				return ((InternalEList<?>)getSpecRelationGroups()).basicRemove(otherEnd, msgs);
+		case ReqIF10Package.REQ_IF_CONTENT__DATATYPES:
+			return ((InternalEList<?>) getDatatypes()).basicRemove(otherEnd, msgs);
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_TYPES:
+			return ((InternalEList<?>) getSpecTypes()).basicRemove(otherEnd, msgs);
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_OBJECTS:
+			return ((InternalEList<?>) getSpecObjects()).basicRemove(otherEnd, msgs);
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATIONS:
+			return ((InternalEList<?>) getSpecRelations()).basicRemove(otherEnd, msgs);
+		case ReqIF10Package.REQ_IF_CONTENT__SPECIFICATIONS:
+			return ((InternalEList<?>) getSpecifications()).basicRemove(otherEnd, msgs);
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATION_GROUPS:
+			return ((InternalEList<?>) getSpecRelationGroups()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF_CONTENT__DATATYPES:
-				return getDatatypes();
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_TYPES:
-				return getSpecTypes();
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_OBJECTS:
-				return getSpecObjects();
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATIONS:
-				return getSpecRelations();
-			case ReqIF10Package.REQ_IF_CONTENT__SPECIFICATIONS:
-				return getSpecifications();
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATION_GROUPS:
-				return getSpecRelationGroups();
+		case ReqIF10Package.REQ_IF_CONTENT__DATATYPES:
+			return getDatatypes();
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_TYPES:
+			return getSpecTypes();
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_OBJECTS:
+			return getSpecObjects();
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATIONS:
+			return getSpecRelations();
+		case ReqIF10Package.REQ_IF_CONTENT__SPECIFICATIONS:
+			return getSpecifications();
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATION_GROUPS:
+			return getSpecRelationGroups();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF_CONTENT__DATATYPES:
-				getDatatypes().clear();
-				getDatatypes().addAll((Collection<? extends DatatypeDefinition>)newValue);
-				return;
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_TYPES:
-				getSpecTypes().clear();
-				getSpecTypes().addAll((Collection<? extends SpecType>)newValue);
-				return;
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_OBJECTS:
-				getSpecObjects().clear();
-				getSpecObjects().addAll((Collection<? extends SpecObject>)newValue);
-				return;
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATIONS:
-				getSpecRelations().clear();
-				getSpecRelations().addAll((Collection<? extends SpecRelation>)newValue);
-				return;
-			case ReqIF10Package.REQ_IF_CONTENT__SPECIFICATIONS:
-				getSpecifications().clear();
-				getSpecifications().addAll((Collection<? extends Specification>)newValue);
-				return;
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATION_GROUPS:
-				getSpecRelationGroups().clear();
-				getSpecRelationGroups().addAll((Collection<? extends RelationGroup>)newValue);
-				return;
+		case ReqIF10Package.REQ_IF_CONTENT__DATATYPES:
+			getDatatypes().clear();
+			getDatatypes().addAll((Collection<? extends DatatypeDefinition>) newValue);
+			return;
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_TYPES:
+			getSpecTypes().clear();
+			getSpecTypes().addAll((Collection<? extends SpecType>) newValue);
+			return;
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_OBJECTS:
+			getSpecObjects().clear();
+			getSpecObjects().addAll((Collection<? extends SpecObject>) newValue);
+			return;
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATIONS:
+			getSpecRelations().clear();
+			getSpecRelations().addAll((Collection<? extends SpecRelation>) newValue);
+			return;
+		case ReqIF10Package.REQ_IF_CONTENT__SPECIFICATIONS:
+			getSpecifications().clear();
+			getSpecifications().addAll((Collection<? extends Specification>) newValue);
+			return;
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATION_GROUPS:
+			getSpecRelationGroups().clear();
+			getSpecRelationGroups().addAll((Collection<? extends RelationGroup>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF_CONTENT__DATATYPES:
-				unsetDatatypes();
-				return;
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_TYPES:
-				unsetSpecTypes();
-				return;
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_OBJECTS:
-				unsetSpecObjects();
-				return;
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATIONS:
-				unsetSpecRelations();
-				return;
-			case ReqIF10Package.REQ_IF_CONTENT__SPECIFICATIONS:
-				unsetSpecifications();
-				return;
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATION_GROUPS:
-				unsetSpecRelationGroups();
-				return;
+		case ReqIF10Package.REQ_IF_CONTENT__DATATYPES:
+			unsetDatatypes();
+			return;
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_TYPES:
+			unsetSpecTypes();
+			return;
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_OBJECTS:
+			unsetSpecObjects();
+			return;
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATIONS:
+			unsetSpecRelations();
+			return;
+		case ReqIF10Package.REQ_IF_CONTENT__SPECIFICATIONS:
+			unsetSpecifications();
+			return;
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATION_GROUPS:
+			unsetSpecRelationGroups();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF_CONTENT__DATATYPES:
-				return isSetDatatypes();
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_TYPES:
-				return isSetSpecTypes();
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_OBJECTS:
-				return isSetSpecObjects();
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATIONS:
-				return isSetSpecRelations();
-			case ReqIF10Package.REQ_IF_CONTENT__SPECIFICATIONS:
-				return isSetSpecifications();
-			case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATION_GROUPS:
-				return isSetSpecRelationGroups();
+		case ReqIF10Package.REQ_IF_CONTENT__DATATYPES:
+			return isSetDatatypes();
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_TYPES:
+			return isSetSpecTypes();
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_OBJECTS:
+			return isSetSpecObjects();
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATIONS:
+			return isSetSpecRelations();
+		case ReqIF10Package.REQ_IF_CONTENT__SPECIFICATIONS:
+			return isSetSpecifications();
+		case ReqIF10Package.REQ_IF_CONTENT__SPEC_RELATION_GROUPS:
+			return isSetSpecRelationGroups();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //ReqIFContentImpl
+} // ReqIFContentImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIFHeaderImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIFHeaderImpl.java
index dc8b15d..57b13e6 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIFHeaderImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIFHeaderImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.ReqIFHeader;
 
@@ -25,24 +25,24 @@
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl#getComment <em>Comment</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl#getCreationTime <em>Creation Time</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl#getRepositoryId <em>Repository Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl#getReqIFToolId <em>Req IF Tool Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl#getReqIFVersion <em>Req IF Version</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl#getSourceToolId <em>Source Tool Id</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl#getComment <em>Comment</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl#getCreationTime <em>Creation Time</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl#getIdentifier <em>Identifier</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl#getRepositoryId <em>Repository Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl#getReqIFToolId <em>Req IF Tool Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl#getReqIFVersion <em>Req IF Version</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl#getSourceToolId <em>Source Tool Id</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFHeaderImpl#getTitle <em>Title</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class ReqIFHeaderImpl extends EObjectImpl implements ReqIFHeader {
+public class ReqIFHeaderImpl extends MinimalEObjectImpl implements ReqIFHeader {
 	/**
-	 * The default value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getComment() <em>Comment</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getComment()
 	 * @generated
 	 * @ordered
@@ -50,9 +50,9 @@
 	protected static final String COMMENT_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getComment() <em>Comment</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getComment()
 	 * @generated
 	 * @ordered
@@ -60,17 +60,17 @@
 	protected String comment = COMMENT_EDEFAULT;
 
 	/**
-	 * This is true if the Comment attribute has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This is true if the Comment attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean commentESet;
 
 	/**
-	 * The default value of the '{@link #getCreationTime() <em>Creation Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getCreationTime() <em>Creation Time</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getCreationTime()
 	 * @generated
 	 * @ordered
@@ -78,9 +78,9 @@
 	protected static final GregorianCalendar CREATION_TIME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCreationTime() <em>Creation Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getCreationTime() <em>Creation Time</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getCreationTime()
 	 * @generated
 	 * @ordered
@@ -88,17 +88,17 @@
 	protected GregorianCalendar creationTime = CREATION_TIME_EDEFAULT;
 
 	/**
-	 * This is true if the Creation Time attribute has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This is true if the Creation Time attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean creationTimeESet;
 
 	/**
-	 * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getIdentifier()
 	 * @generated
 	 * @ordered
@@ -106,9 +106,9 @@
 	protected static final String IDENTIFIER_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getIdentifier()
 	 * @generated
 	 * @ordered
@@ -116,17 +116,17 @@
 	protected String identifier = IDENTIFIER_EDEFAULT;
 
 	/**
-	 * This is true if the Identifier attribute has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This is true if the Identifier attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean identifierESet;
 
 	/**
-	 * The default value of the '{@link #getRepositoryId() <em>Repository Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getRepositoryId() <em>Repository Id</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getRepositoryId()
 	 * @generated
 	 * @ordered
@@ -134,9 +134,9 @@
 	protected static final String REPOSITORY_ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getRepositoryId() <em>Repository Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getRepositoryId() <em>Repository Id</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getRepositoryId()
 	 * @generated
 	 * @ordered
@@ -144,17 +144,17 @@
 	protected String repositoryId = REPOSITORY_ID_EDEFAULT;
 
 	/**
-	 * This is true if the Repository Id attribute has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This is true if the Repository Id attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean repositoryIdESet;
 
 	/**
-	 * The default value of the '{@link #getReqIFToolId() <em>Req IF Tool Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getReqIFToolId() <em>Req IF Tool Id</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getReqIFToolId()
 	 * @generated
 	 * @ordered
@@ -162,9 +162,9 @@
 	protected static final String REQ_IF_TOOL_ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getReqIFToolId() <em>Req IF Tool Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getReqIFToolId() <em>Req IF Tool Id</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getReqIFToolId()
 	 * @generated
 	 * @ordered
@@ -172,17 +172,17 @@
 	protected String reqIFToolId = REQ_IF_TOOL_ID_EDEFAULT;
 
 	/**
-	 * This is true if the Req IF Tool Id attribute has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This is true if the Req IF Tool Id attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean reqIFToolIdESet;
 
 	/**
-	 * The default value of the '{@link #getReqIFVersion() <em>Req IF Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getReqIFVersion() <em>Req IF Version</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getReqIFVersion()
 	 * @generated
 	 * @ordered
@@ -190,9 +190,9 @@
 	protected static final String REQ_IF_VERSION_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getReqIFVersion() <em>Req IF Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getReqIFVersion() <em>Req IF Version</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getReqIFVersion()
 	 * @generated
 	 * @ordered
@@ -200,17 +200,17 @@
 	protected String reqIFVersion = REQ_IF_VERSION_EDEFAULT;
 
 	/**
-	 * This is true if the Req IF Version attribute has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This is true if the Req IF Version attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean reqIFVersionESet;
 
 	/**
-	 * The default value of the '{@link #getSourceToolId() <em>Source Tool Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getSourceToolId() <em>Source Tool Id</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSourceToolId()
 	 * @generated
 	 * @ordered
@@ -218,9 +218,9 @@
 	protected static final String SOURCE_TOOL_ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getSourceToolId() <em>Source Tool Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getSourceToolId() <em>Source Tool Id</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSourceToolId()
 	 * @generated
 	 * @ordered
@@ -228,17 +228,17 @@
 	protected String sourceToolId = SOURCE_TOOL_ID_EDEFAULT;
 
 	/**
-	 * This is true if the Source Tool Id attribute has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This is true if the Source Tool Id attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean sourceToolIdESet;
 
 	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getTitle()
 	 * @generated
 	 * @ordered
@@ -256,8 +256,8 @@
 	protected String title = TITLE_EDEFAULT;
 
 	/**
-	 * This is true if the Title attribute has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * This is true if the Title attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -265,6 +265,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ReqIFHeaderImpl() {
@@ -273,6 +274,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -282,6 +284,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getComment() {
@@ -290,6 +293,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setComment(String newComment) {
@@ -297,12 +301,14 @@
 		comment = newComment;
 		boolean oldCommentESet = commentESet;
 		commentESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF_HEADER__COMMENT, oldComment, comment, !oldCommentESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetComment() {
@@ -310,12 +316,15 @@
 		boolean oldCommentESet = commentESet;
 		comment = COMMENT_EDEFAULT;
 		commentESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF_HEADER__COMMENT, oldComment, COMMENT_EDEFAULT, oldCommentESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF_HEADER__COMMENT, oldComment, COMMENT_EDEFAULT,
+					oldCommentESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetComment() {
@@ -324,6 +333,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GregorianCalendar getCreationTime() {
@@ -332,6 +342,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCreationTime(GregorianCalendar newCreationTime) {
@@ -339,12 +350,15 @@
 		creationTime = newCreationTime;
 		boolean oldCreationTimeESet = creationTimeESet;
 		creationTimeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF_HEADER__CREATION_TIME, oldCreationTime, creationTime, !oldCreationTimeESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF_HEADER__CREATION_TIME, oldCreationTime, creationTime,
+					!oldCreationTimeESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetCreationTime() {
@@ -352,12 +366,15 @@
 		boolean oldCreationTimeESet = creationTimeESet;
 		creationTime = CREATION_TIME_EDEFAULT;
 		creationTimeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF_HEADER__CREATION_TIME, oldCreationTime, CREATION_TIME_EDEFAULT, oldCreationTimeESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF_HEADER__CREATION_TIME, oldCreationTime,
+					CREATION_TIME_EDEFAULT, oldCreationTimeESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetCreationTime() {
@@ -366,6 +383,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getIdentifier() {
@@ -374,6 +392,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIdentifier(String newIdentifier) {
@@ -381,12 +400,15 @@
 		identifier = newIdentifier;
 		boolean oldIdentifierESet = identifierESet;
 		identifierESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF_HEADER__IDENTIFIER, oldIdentifier, identifier, !oldIdentifierESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF_HEADER__IDENTIFIER, oldIdentifier, identifier,
+					!oldIdentifierESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetIdentifier() {
@@ -394,12 +416,15 @@
 		boolean oldIdentifierESet = identifierESet;
 		identifier = IDENTIFIER_EDEFAULT;
 		identifierESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF_HEADER__IDENTIFIER, oldIdentifier, IDENTIFIER_EDEFAULT, oldIdentifierESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF_HEADER__IDENTIFIER, oldIdentifier, IDENTIFIER_EDEFAULT,
+					oldIdentifierESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetIdentifier() {
@@ -408,6 +433,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getRepositoryId() {
@@ -416,6 +442,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRepositoryId(String newRepositoryId) {
@@ -423,12 +450,15 @@
 		repositoryId = newRepositoryId;
 		boolean oldRepositoryIdESet = repositoryIdESet;
 		repositoryIdESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF_HEADER__REPOSITORY_ID, oldRepositoryId, repositoryId, !oldRepositoryIdESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF_HEADER__REPOSITORY_ID, oldRepositoryId, repositoryId,
+					!oldRepositoryIdESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetRepositoryId() {
@@ -436,12 +466,15 @@
 		boolean oldRepositoryIdESet = repositoryIdESet;
 		repositoryId = REPOSITORY_ID_EDEFAULT;
 		repositoryIdESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF_HEADER__REPOSITORY_ID, oldRepositoryId, REPOSITORY_ID_EDEFAULT, oldRepositoryIdESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF_HEADER__REPOSITORY_ID, oldRepositoryId,
+					REPOSITORY_ID_EDEFAULT, oldRepositoryIdESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetRepositoryId() {
@@ -450,6 +483,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getReqIFToolId() {
@@ -458,6 +492,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setReqIFToolId(String newReqIFToolId) {
@@ -465,12 +500,15 @@
 		reqIFToolId = newReqIFToolId;
 		boolean oldReqIFToolIdESet = reqIFToolIdESet;
 		reqIFToolIdESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF_HEADER__REQ_IF_TOOL_ID, oldReqIFToolId, reqIFToolId, !oldReqIFToolIdESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF_HEADER__REQ_IF_TOOL_ID, oldReqIFToolId, reqIFToolId,
+					!oldReqIFToolIdESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetReqIFToolId() {
@@ -478,12 +516,15 @@
 		boolean oldReqIFToolIdESet = reqIFToolIdESet;
 		reqIFToolId = REQ_IF_TOOL_ID_EDEFAULT;
 		reqIFToolIdESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF_HEADER__REQ_IF_TOOL_ID, oldReqIFToolId, REQ_IF_TOOL_ID_EDEFAULT, oldReqIFToolIdESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF_HEADER__REQ_IF_TOOL_ID, oldReqIFToolId,
+					REQ_IF_TOOL_ID_EDEFAULT, oldReqIFToolIdESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetReqIFToolId() {
@@ -492,6 +533,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getReqIFVersion() {
@@ -500,6 +542,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setReqIFVersion(String newReqIFVersion) {
@@ -507,12 +550,15 @@
 		reqIFVersion = newReqIFVersion;
 		boolean oldReqIFVersionESet = reqIFVersionESet;
 		reqIFVersionESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF_HEADER__REQ_IF_VERSION, oldReqIFVersion, reqIFVersion, !oldReqIFVersionESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF_HEADER__REQ_IF_VERSION, oldReqIFVersion, reqIFVersion,
+					!oldReqIFVersionESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetReqIFVersion() {
@@ -520,12 +566,15 @@
 		boolean oldReqIFVersionESet = reqIFVersionESet;
 		reqIFVersion = REQ_IF_VERSION_EDEFAULT;
 		reqIFVersionESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF_HEADER__REQ_IF_VERSION, oldReqIFVersion, REQ_IF_VERSION_EDEFAULT, oldReqIFVersionESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF_HEADER__REQ_IF_VERSION, oldReqIFVersion,
+					REQ_IF_VERSION_EDEFAULT, oldReqIFVersionESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetReqIFVersion() {
@@ -534,6 +583,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getSourceToolId() {
@@ -542,6 +592,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSourceToolId(String newSourceToolId) {
@@ -549,12 +600,15 @@
 		sourceToolId = newSourceToolId;
 		boolean oldSourceToolIdESet = sourceToolIdESet;
 		sourceToolIdESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF_HEADER__SOURCE_TOOL_ID, oldSourceToolId, sourceToolId, !oldSourceToolIdESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF_HEADER__SOURCE_TOOL_ID, oldSourceToolId, sourceToolId,
+					!oldSourceToolIdESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSourceToolId() {
@@ -562,12 +616,15 @@
 		boolean oldSourceToolIdESet = sourceToolIdESet;
 		sourceToolId = SOURCE_TOOL_ID_EDEFAULT;
 		sourceToolIdESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF_HEADER__SOURCE_TOOL_ID, oldSourceToolId, SOURCE_TOOL_ID_EDEFAULT, oldSourceToolIdESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF_HEADER__SOURCE_TOOL_ID, oldSourceToolId,
+					SOURCE_TOOL_ID_EDEFAULT, oldSourceToolIdESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSourceToolId() {
@@ -576,6 +633,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTitle() {
@@ -584,6 +642,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTitle(String newTitle) {
@@ -591,12 +650,14 @@
 		title = newTitle;
 		boolean oldTitleESet = titleESet;
 		titleESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF_HEADER__TITLE, oldTitle, title, !oldTitleESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetTitle() {
@@ -604,12 +665,14 @@
 		boolean oldTitleESet = titleESet;
 		title = TITLE_EDEFAULT;
 		titleESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF_HEADER__TITLE, oldTitle, TITLE_EDEFAULT, oldTitleESet));
+		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetTitle() {
@@ -618,153 +681,192 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF_HEADER__COMMENT:
-				return getComment();
-			case ReqIF10Package.REQ_IF_HEADER__CREATION_TIME:
-				return getCreationTime();
-			case ReqIF10Package.REQ_IF_HEADER__IDENTIFIER:
-				return getIdentifier();
-			case ReqIF10Package.REQ_IF_HEADER__REPOSITORY_ID:
-				return getRepositoryId();
-			case ReqIF10Package.REQ_IF_HEADER__REQ_IF_TOOL_ID:
-				return getReqIFToolId();
-			case ReqIF10Package.REQ_IF_HEADER__REQ_IF_VERSION:
-				return getReqIFVersion();
-			case ReqIF10Package.REQ_IF_HEADER__SOURCE_TOOL_ID:
-				return getSourceToolId();
-			case ReqIF10Package.REQ_IF_HEADER__TITLE:
-				return getTitle();
+		case ReqIF10Package.REQ_IF_HEADER__COMMENT:
+			return getComment();
+		case ReqIF10Package.REQ_IF_HEADER__CREATION_TIME:
+			return getCreationTime();
+		case ReqIF10Package.REQ_IF_HEADER__IDENTIFIER:
+			return getIdentifier();
+		case ReqIF10Package.REQ_IF_HEADER__REPOSITORY_ID:
+			return getRepositoryId();
+		case ReqIF10Package.REQ_IF_HEADER__REQ_IF_TOOL_ID:
+			return getReqIFToolId();
+		case ReqIF10Package.REQ_IF_HEADER__REQ_IF_VERSION:
+			return getReqIFVersion();
+		case ReqIF10Package.REQ_IF_HEADER__SOURCE_TOOL_ID:
+			return getSourceToolId();
+		case ReqIF10Package.REQ_IF_HEADER__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF_HEADER__COMMENT:
-				setComment((String)newValue);
-				return;
-			case ReqIF10Package.REQ_IF_HEADER__CREATION_TIME:
-				setCreationTime((GregorianCalendar)newValue);
-				return;
-			case ReqIF10Package.REQ_IF_HEADER__IDENTIFIER:
-				setIdentifier((String)newValue);
-				return;
-			case ReqIF10Package.REQ_IF_HEADER__REPOSITORY_ID:
-				setRepositoryId((String)newValue);
-				return;
-			case ReqIF10Package.REQ_IF_HEADER__REQ_IF_TOOL_ID:
-				setReqIFToolId((String)newValue);
-				return;
-			case ReqIF10Package.REQ_IF_HEADER__REQ_IF_VERSION:
-				setReqIFVersion((String)newValue);
-				return;
-			case ReqIF10Package.REQ_IF_HEADER__SOURCE_TOOL_ID:
-				setSourceToolId((String)newValue);
-				return;
-			case ReqIF10Package.REQ_IF_HEADER__TITLE:
-				setTitle((String)newValue);
-				return;
+		case ReqIF10Package.REQ_IF_HEADER__COMMENT:
+			setComment((String) newValue);
+			return;
+		case ReqIF10Package.REQ_IF_HEADER__CREATION_TIME:
+			setCreationTime((GregorianCalendar) newValue);
+			return;
+		case ReqIF10Package.REQ_IF_HEADER__IDENTIFIER:
+			setIdentifier((String) newValue);
+			return;
+		case ReqIF10Package.REQ_IF_HEADER__REPOSITORY_ID:
+			setRepositoryId((String) newValue);
+			return;
+		case ReqIF10Package.REQ_IF_HEADER__REQ_IF_TOOL_ID:
+			setReqIFToolId((String) newValue);
+			return;
+		case ReqIF10Package.REQ_IF_HEADER__REQ_IF_VERSION:
+			setReqIFVersion((String) newValue);
+			return;
+		case ReqIF10Package.REQ_IF_HEADER__SOURCE_TOOL_ID:
+			setSourceToolId((String) newValue);
+			return;
+		case ReqIF10Package.REQ_IF_HEADER__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF_HEADER__COMMENT:
-				unsetComment();
-				return;
-			case ReqIF10Package.REQ_IF_HEADER__CREATION_TIME:
-				unsetCreationTime();
-				return;
-			case ReqIF10Package.REQ_IF_HEADER__IDENTIFIER:
-				unsetIdentifier();
-				return;
-			case ReqIF10Package.REQ_IF_HEADER__REPOSITORY_ID:
-				unsetRepositoryId();
-				return;
-			case ReqIF10Package.REQ_IF_HEADER__REQ_IF_TOOL_ID:
-				unsetReqIFToolId();
-				return;
-			case ReqIF10Package.REQ_IF_HEADER__REQ_IF_VERSION:
-				unsetReqIFVersion();
-				return;
-			case ReqIF10Package.REQ_IF_HEADER__SOURCE_TOOL_ID:
-				unsetSourceToolId();
-				return;
-			case ReqIF10Package.REQ_IF_HEADER__TITLE:
-				unsetTitle();
-				return;
+		case ReqIF10Package.REQ_IF_HEADER__COMMENT:
+			unsetComment();
+			return;
+		case ReqIF10Package.REQ_IF_HEADER__CREATION_TIME:
+			unsetCreationTime();
+			return;
+		case ReqIF10Package.REQ_IF_HEADER__IDENTIFIER:
+			unsetIdentifier();
+			return;
+		case ReqIF10Package.REQ_IF_HEADER__REPOSITORY_ID:
+			unsetRepositoryId();
+			return;
+		case ReqIF10Package.REQ_IF_HEADER__REQ_IF_TOOL_ID:
+			unsetReqIFToolId();
+			return;
+		case ReqIF10Package.REQ_IF_HEADER__REQ_IF_VERSION:
+			unsetReqIFVersion();
+			return;
+		case ReqIF10Package.REQ_IF_HEADER__SOURCE_TOOL_ID:
+			unsetSourceToolId();
+			return;
+		case ReqIF10Package.REQ_IF_HEADER__TITLE:
+			unsetTitle();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF_HEADER__COMMENT:
-				return isSetComment();
-			case ReqIF10Package.REQ_IF_HEADER__CREATION_TIME:
-				return isSetCreationTime();
-			case ReqIF10Package.REQ_IF_HEADER__IDENTIFIER:
-				return isSetIdentifier();
-			case ReqIF10Package.REQ_IF_HEADER__REPOSITORY_ID:
-				return isSetRepositoryId();
-			case ReqIF10Package.REQ_IF_HEADER__REQ_IF_TOOL_ID:
-				return isSetReqIFToolId();
-			case ReqIF10Package.REQ_IF_HEADER__REQ_IF_VERSION:
-				return isSetReqIFVersion();
-			case ReqIF10Package.REQ_IF_HEADER__SOURCE_TOOL_ID:
-				return isSetSourceToolId();
-			case ReqIF10Package.REQ_IF_HEADER__TITLE:
-				return isSetTitle();
+		case ReqIF10Package.REQ_IF_HEADER__COMMENT:
+			return isSetComment();
+		case ReqIF10Package.REQ_IF_HEADER__CREATION_TIME:
+			return isSetCreationTime();
+		case ReqIF10Package.REQ_IF_HEADER__IDENTIFIER:
+			return isSetIdentifier();
+		case ReqIF10Package.REQ_IF_HEADER__REPOSITORY_ID:
+			return isSetRepositoryId();
+		case ReqIF10Package.REQ_IF_HEADER__REQ_IF_TOOL_ID:
+			return isSetReqIFToolId();
+		case ReqIF10Package.REQ_IF_HEADER__REQ_IF_VERSION:
+			return isSetReqIFVersion();
+		case ReqIF10Package.REQ_IF_HEADER__SOURCE_TOOL_ID:
+			return isSetSourceToolId();
+		case ReqIF10Package.REQ_IF_HEADER__TITLE:
+			return isSetTitle();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy()) {
+			return super.toString();
+		}
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (comment: ");
-		if (commentESet) result.append(comment); else result.append("<unset>");
-		result.append(", creationTime: ");
-		if (creationTimeESet) result.append(creationTime); else result.append("<unset>");
-		result.append(", identifier: ");
-		if (identifierESet) result.append(identifier); else result.append("<unset>");
-		result.append(", repositoryId: ");
-		if (repositoryIdESet) result.append(repositoryId); else result.append("<unset>");
-		result.append(", reqIFToolId: ");
-		if (reqIFToolIdESet) result.append(reqIFToolId); else result.append("<unset>");
-		result.append(", reqIFVersion: ");
-		if (reqIFVersionESet) result.append(reqIFVersion); else result.append("<unset>");
-		result.append(", sourceToolId: ");
-		if (sourceToolIdESet) result.append(sourceToolId); else result.append("<unset>");
-		result.append(", title: ");
-		if (titleESet) result.append(title); else result.append("<unset>");
+		result.append(" (comment: "); //$NON-NLS-1$
+		if (commentESet) {
+			result.append(comment);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", creationTime: "); //$NON-NLS-1$
+		if (creationTimeESet) {
+			result.append(creationTime);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", identifier: "); //$NON-NLS-1$
+		if (identifierESet) {
+			result.append(identifier);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", repositoryId: "); //$NON-NLS-1$
+		if (repositoryIdESet) {
+			result.append(repositoryId);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", reqIFToolId: "); //$NON-NLS-1$
+		if (reqIFToolIdESet) {
+			result.append(reqIFToolId);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", reqIFVersion: "); //$NON-NLS-1$
+		if (reqIFVersionESet) {
+			result.append(reqIFVersion);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", sourceToolId: "); //$NON-NLS-1$
+		if (sourceToolIdESet) {
+			result.append(sourceToolId);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
+		result.append(", title: "); //$NON-NLS-1$
+		if (titleESet) {
+			result.append(title);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
 		result.append(')');
 		return result.toString();
 	}
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIFImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIFImpl.java
index 070bf5e..bc64549 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIFImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIFImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,18 +15,13 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.rmf.reqif10.ReqIF;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.ReqIFContent;
@@ -34,26 +29,24 @@
 import org.eclipse.rmf.reqif10.ReqIFToolExtension;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Req IF</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Req IF</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFImpl#getTheHeader <em>The Header</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFImpl#getCoreContent <em>Core Content</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFImpl#getToolExtensions <em>Tool Extensions</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFImpl#getLang <em>Lang</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFImpl#getTheHeader <em>The Header</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFImpl#getCoreContent <em>Core Content</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFImpl#getToolExtensions <em>Tool Extensions</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class ReqIFImpl extends EObjectImpl implements ReqIF {
+public class ReqIFImpl extends MinimalEObjectImpl implements ReqIF {
 	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -61,9 +54,9 @@
 	protected static final String LANG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getLang()
 	 * @generated
 	 * @ordered
@@ -71,18 +64,17 @@
 	protected String lang = LANG_EDEFAULT;
 
 	/**
-	 * This is true if the Lang attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Lang attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean langESet;
 
 	/**
-	 * The cached value of the '{@link #getTheHeader() <em>The Header</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTheHeader() <em>The Header</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTheHeader()
 	 * @generated
 	 * @ordered
@@ -90,18 +82,17 @@
 	protected ReqIFHeader theHeader;
 
 	/**
-	 * This is true if the The Header containment reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the The Header containment reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean theHeaderESet;
 
 	/**
-	 * The cached value of the '{@link #getCoreContent() <em>Core Content</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCoreContent() <em>Core Content</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getCoreContent()
 	 * @generated
 	 * @ordered
@@ -109,18 +100,18 @@
 	protected ReqIFContent coreContent;
 
 	/**
-	 * This is true if the Core Content containment reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Core Content containment reference has been set. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean coreContentESet;
 
 	/**
-	 * The cached value of the '{@link #getToolExtensions() <em>Tool Extensions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getToolExtensions() <em>Tool Extensions</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getToolExtensions()
 	 * @generated
 	 * @ordered
@@ -128,8 +119,8 @@
 	protected EList<ReqIFToolExtension> toolExtensions;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ReqIFImpl() {
@@ -137,8 +128,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -147,8 +138,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLang() {
@@ -156,8 +147,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLang(String newLang) {
@@ -165,13 +156,14 @@
 		lang = newLang;
 		boolean oldLangESet = langESet;
 		langESet = true;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF__LANG, oldLang, lang, !oldLangESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetLang() {
@@ -179,13 +171,14 @@
 		boolean oldLangESet = langESet;
 		lang = LANG_EDEFAULT;
 		langESet = false;
-		if (eNotificationRequired())
+		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF__LANG, oldLang, LANG_EDEFAULT, oldLangESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetLang() {
@@ -193,8 +186,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ReqIFHeader getTheHeader() {
@@ -202,8 +195,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTheHeader(ReqIFHeader newTheHeader, NotificationChain msgs) {
@@ -212,38 +205,48 @@
 		boolean oldTheHeaderESet = theHeaderESet;
 		theHeaderESet = true;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF__THE_HEADER, oldTheHeader, newTheHeader, !oldTheHeaderESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF__THE_HEADER, oldTheHeader,
+					newTheHeader, !oldTheHeaderESet);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTheHeader(ReqIFHeader newTheHeader) {
 		if (newTheHeader != theHeader) {
 			NotificationChain msgs = null;
-			if (theHeader != null)
-				msgs = ((InternalEObject)theHeader).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.REQ_IF__THE_HEADER, null, msgs);
-			if (newTheHeader != null)
-				msgs = ((InternalEObject)newTheHeader).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.REQ_IF__THE_HEADER, null, msgs);
+			if (theHeader != null) {
+				msgs = ((InternalEObject) theHeader).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.REQ_IF__THE_HEADER, null, msgs);
+			}
+			if (newTheHeader != null) {
+				msgs = ((InternalEObject) newTheHeader).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.REQ_IF__THE_HEADER, null, msgs);
+			}
 			msgs = basicSetTheHeader(newTheHeader, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else {
 			boolean oldTheHeaderESet = theHeaderESet;
 			theHeaderESet = true;
-			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF__THE_HEADER, newTheHeader, newTheHeader, !oldTheHeaderESet));
+			if (eNotificationRequired()) {
+				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF__THE_HEADER, newTheHeader, newTheHeader,
+						!oldTheHeaderESet));
+			}
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetTheHeader(NotificationChain msgs) {
@@ -252,35 +255,42 @@
 		boolean oldTheHeaderESet = theHeaderESet;
 		theHeaderESet = false;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF__THE_HEADER, oldTheHeader, null, oldTheHeaderESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF__THE_HEADER, oldTheHeader, null,
+					oldTheHeaderESet);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetTheHeader() {
 		if (theHeader != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject)theHeader).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.REQ_IF__THE_HEADER, null, msgs);
+			msgs = ((InternalEObject) theHeader).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.REQ_IF__THE_HEADER, null, msgs);
 			msgs = basicUnsetTheHeader(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else {
 			boolean oldTheHeaderESet = theHeaderESet;
 			theHeaderESet = false;
-			if (eNotificationRequired())
+			if (eNotificationRequired()) {
 				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF__THE_HEADER, null, null, oldTheHeaderESet));
+			}
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetTheHeader() {
@@ -288,8 +298,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ReqIFContent getCoreContent() {
@@ -297,8 +307,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetCoreContent(ReqIFContent newCoreContent, NotificationChain msgs) {
@@ -307,38 +317,48 @@
 		boolean oldCoreContentESet = coreContentESet;
 		coreContentESet = true;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF__CORE_CONTENT, oldCoreContent, newCoreContent, !oldCoreContentESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF__CORE_CONTENT, oldCoreContent,
+					newCoreContent, !oldCoreContentESet);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCoreContent(ReqIFContent newCoreContent) {
 		if (newCoreContent != coreContent) {
 			NotificationChain msgs = null;
-			if (coreContent != null)
-				msgs = ((InternalEObject)coreContent).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.REQ_IF__CORE_CONTENT, null, msgs);
-			if (newCoreContent != null)
-				msgs = ((InternalEObject)newCoreContent).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.REQ_IF__CORE_CONTENT, null, msgs);
+			if (coreContent != null) {
+				msgs = ((InternalEObject) coreContent).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.REQ_IF__CORE_CONTENT, null, msgs);
+			}
+			if (newCoreContent != null) {
+				msgs = ((InternalEObject) newCoreContent).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.REQ_IF__CORE_CONTENT, null, msgs);
+			}
 			msgs = basicSetCoreContent(newCoreContent, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else {
 			boolean oldCoreContentESet = coreContentESet;
 			coreContentESet = true;
-			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF__CORE_CONTENT, newCoreContent, newCoreContent, !oldCoreContentESet));
+			if (eNotificationRequired()) {
+				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.REQ_IF__CORE_CONTENT, newCoreContent, newCoreContent,
+						!oldCoreContentESet));
+			}
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetCoreContent(NotificationChain msgs) {
@@ -347,35 +367,42 @@
 		boolean oldCoreContentESet = coreContentESet;
 		coreContentESet = false;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF__CORE_CONTENT, oldCoreContent, null, oldCoreContentESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF__CORE_CONTENT, oldCoreContent,
+					null, oldCoreContentESet);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetCoreContent() {
 		if (coreContent != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject)coreContent).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.REQ_IF__CORE_CONTENT, null, msgs);
+			msgs = ((InternalEObject) coreContent).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.REQ_IF__CORE_CONTENT, null, msgs);
 			msgs = basicUnsetCoreContent(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else {
 			boolean oldCoreContentESet = coreContentESet;
 			coreContentESet = false;
-			if (eNotificationRequired())
+			if (eNotificationRequired()) {
 				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.REQ_IF__CORE_CONTENT, null, null, oldCoreContentESet));
+			}
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetCoreContent() {
@@ -383,157 +410,166 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<ReqIFToolExtension> getToolExtensions() {
 		if (toolExtensions == null) {
-			toolExtensions = new EObjectContainmentEList.Unsettable<ReqIFToolExtension>(ReqIFToolExtension.class, this, ReqIF10Package.REQ_IF__TOOL_EXTENSIONS);
+			toolExtensions = new EObjectContainmentEList.Unsettable<ReqIFToolExtension>(ReqIFToolExtension.class, this,
+					ReqIF10Package.REQ_IF__TOOL_EXTENSIONS);
 		}
 		return toolExtensions;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetToolExtensions() {
-		if (toolExtensions != null) ((InternalEList.Unsettable<?>)toolExtensions).unset();
+		if (toolExtensions != null) {
+			((InternalEList.Unsettable<?>) toolExtensions).unset();
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetToolExtensions() {
-		return toolExtensions != null && ((InternalEList.Unsettable<?>)toolExtensions).isSet();
+		return toolExtensions != null && ((InternalEList.Unsettable<?>) toolExtensions).isSet();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF__THE_HEADER:
-				return basicUnsetTheHeader(msgs);
-			case ReqIF10Package.REQ_IF__CORE_CONTENT:
-				return basicUnsetCoreContent(msgs);
-			case ReqIF10Package.REQ_IF__TOOL_EXTENSIONS:
-				return ((InternalEList<?>)getToolExtensions()).basicRemove(otherEnd, msgs);
+		case ReqIF10Package.REQ_IF__THE_HEADER:
+			return basicUnsetTheHeader(msgs);
+		case ReqIF10Package.REQ_IF__CORE_CONTENT:
+			return basicUnsetCoreContent(msgs);
+		case ReqIF10Package.REQ_IF__TOOL_EXTENSIONS:
+			return ((InternalEList<?>) getToolExtensions()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF__LANG:
-				return getLang();
-			case ReqIF10Package.REQ_IF__THE_HEADER:
-				return getTheHeader();
-			case ReqIF10Package.REQ_IF__CORE_CONTENT:
-				return getCoreContent();
-			case ReqIF10Package.REQ_IF__TOOL_EXTENSIONS:
-				return getToolExtensions();
+		case ReqIF10Package.REQ_IF__LANG:
+			return getLang();
+		case ReqIF10Package.REQ_IF__THE_HEADER:
+			return getTheHeader();
+		case ReqIF10Package.REQ_IF__CORE_CONTENT:
+			return getCoreContent();
+		case ReqIF10Package.REQ_IF__TOOL_EXTENSIONS:
+			return getToolExtensions();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF__LANG:
-				setLang((String)newValue);
-				return;
-			case ReqIF10Package.REQ_IF__THE_HEADER:
-				setTheHeader((ReqIFHeader)newValue);
-				return;
-			case ReqIF10Package.REQ_IF__CORE_CONTENT:
-				setCoreContent((ReqIFContent)newValue);
-				return;
-			case ReqIF10Package.REQ_IF__TOOL_EXTENSIONS:
-				getToolExtensions().clear();
-				getToolExtensions().addAll((Collection<? extends ReqIFToolExtension>)newValue);
-				return;
+		case ReqIF10Package.REQ_IF__LANG:
+			setLang((String) newValue);
+			return;
+		case ReqIF10Package.REQ_IF__THE_HEADER:
+			setTheHeader((ReqIFHeader) newValue);
+			return;
+		case ReqIF10Package.REQ_IF__CORE_CONTENT:
+			setCoreContent((ReqIFContent) newValue);
+			return;
+		case ReqIF10Package.REQ_IF__TOOL_EXTENSIONS:
+			getToolExtensions().clear();
+			getToolExtensions().addAll((Collection<? extends ReqIFToolExtension>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF__LANG:
-				unsetLang();
-				return;
-			case ReqIF10Package.REQ_IF__THE_HEADER:
-				unsetTheHeader();
-				return;
-			case ReqIF10Package.REQ_IF__CORE_CONTENT:
-				unsetCoreContent();
-				return;
-			case ReqIF10Package.REQ_IF__TOOL_EXTENSIONS:
-				unsetToolExtensions();
-				return;
+		case ReqIF10Package.REQ_IF__LANG:
+			unsetLang();
+			return;
+		case ReqIF10Package.REQ_IF__THE_HEADER:
+			unsetTheHeader();
+			return;
+		case ReqIF10Package.REQ_IF__CORE_CONTENT:
+			unsetCoreContent();
+			return;
+		case ReqIF10Package.REQ_IF__TOOL_EXTENSIONS:
+			unsetToolExtensions();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF__LANG:
-				return isSetLang();
-			case ReqIF10Package.REQ_IF__THE_HEADER:
-				return isSetTheHeader();
-			case ReqIF10Package.REQ_IF__CORE_CONTENT:
-				return isSetCoreContent();
-			case ReqIF10Package.REQ_IF__TOOL_EXTENSIONS:
-				return isSetToolExtensions();
+		case ReqIF10Package.REQ_IF__LANG:
+			return isSetLang();
+		case ReqIF10Package.REQ_IF__THE_HEADER:
+			return isSetTheHeader();
+		case ReqIF10Package.REQ_IF__CORE_CONTENT:
+			return isSetCoreContent();
+		case ReqIF10Package.REQ_IF__TOOL_EXTENSIONS:
+			return isSetToolExtensions();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy()) {
+			return super.toString();
+		}
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (lang: ");
-		if (langESet) result.append(lang); else result.append("<unset>");
+		result.append(" (lang: "); //$NON-NLS-1$
+		if (langESet) {
+			result.append(lang);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
 		result.append(')');
 		return result.toString();
 	}
 
-} //ReqIFImpl
+} // ReqIFImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIFToolExtensionImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIFToolExtensionImpl.java
index 5fe8e34..87374ad 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIFToolExtensionImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/ReqIFToolExtensionImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,39 +14,33 @@
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.ReqIFToolExtension;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Req IF Tool Extension</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Req IF Tool Extension</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFToolExtensionImpl#getExtensions <em>Extensions</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.ReqIFToolExtensionImpl#getExtensions <em>Extensions</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class ReqIFToolExtensionImpl extends EObjectImpl implements ReqIFToolExtension {
+public class ReqIFToolExtensionImpl extends MinimalEObjectImpl implements ReqIFToolExtension {
 	/**
-	 * The cached value of the '{@link #getExtensions() <em>Extensions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getExtensions() <em>Extensions</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getExtensions()
 	 * @generated
 	 * @ordered
@@ -54,8 +48,8 @@
 	protected EList<EObject> extensions;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ReqIFToolExtensionImpl() {
@@ -63,8 +57,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,8 +67,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<EObject> getExtensions() {
@@ -85,95 +79,97 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetExtensions() {
-		if (extensions != null) ((InternalEList.Unsettable<?>)extensions).unset();
+		if (extensions != null) {
+			((InternalEList.Unsettable<?>) extensions).unset();
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetExtensions() {
-		return extensions != null && ((InternalEList.Unsettable<?>)extensions).isSet();
+		return extensions != null && ((InternalEList.Unsettable<?>) extensions).isSet();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF_TOOL_EXTENSION__EXTENSIONS:
-				return ((InternalEList<?>)getExtensions()).basicRemove(otherEnd, msgs);
+		case ReqIF10Package.REQ_IF_TOOL_EXTENSION__EXTENSIONS:
+			return ((InternalEList<?>) getExtensions()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF_TOOL_EXTENSION__EXTENSIONS:
-				return getExtensions();
+		case ReqIF10Package.REQ_IF_TOOL_EXTENSION__EXTENSIONS:
+			return getExtensions();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF_TOOL_EXTENSION__EXTENSIONS:
-				getExtensions().clear();
-				getExtensions().addAll((Collection<? extends EObject>)newValue);
-				return;
+		case ReqIF10Package.REQ_IF_TOOL_EXTENSION__EXTENSIONS:
+			getExtensions().clear();
+			getExtensions().addAll((Collection<? extends EObject>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF_TOOL_EXTENSION__EXTENSIONS:
-				unsetExtensions();
-				return;
+		case ReqIF10Package.REQ_IF_TOOL_EXTENSION__EXTENSIONS:
+			unsetExtensions();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.REQ_IF_TOOL_EXTENSION__EXTENSIONS:
-				return isSetExtensions();
+		case ReqIF10Package.REQ_IF_TOOL_EXTENSION__EXTENSIONS:
+			return isSetExtensions();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //ReqIFToolExtensionImpl
+} // ReqIFToolExtensionImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecElementWithAttributesImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecElementWithAttributesImpl.java
index b3d9dca..2915308 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecElementWithAttributesImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecElementWithAttributesImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,37 +14,32 @@
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.rmf.reqif10.AttributeValue;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.SpecElementWithAttributes;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Spec Element With Attributes</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Spec Element With Attributes</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.SpecElementWithAttributesImpl#getValues <em>Values</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.SpecElementWithAttributesImpl#getValues <em>Values</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class SpecElementWithAttributesImpl extends IdentifiableImpl implements SpecElementWithAttributes {
 	/**
-	 * The cached value of the '{@link #getValues() <em>Values</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getValues() <em>Values</em>}' containment reference list. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getValues()
 	 * @generated
 	 * @ordered
@@ -52,8 +47,8 @@
 	protected EList<AttributeValue> values;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SpecElementWithAttributesImpl() {
@@ -61,8 +56,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -71,107 +66,109 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<AttributeValue> getValues() {
 		if (values == null) {
-			values = new EObjectContainmentEList.Unsettable<AttributeValue>(AttributeValue.class, this, ReqIF10Package.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES);
+			values = new EObjectContainmentEList.Unsettable<AttributeValue>(AttributeValue.class, this,
+					ReqIF10Package.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES);
 		}
 		return values;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetValues() {
-		if (values != null) ((InternalEList.Unsettable<?>)values).unset();
+		if (values != null)
+			((InternalEList.Unsettable<?>) values).unset();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetValues() {
-		return values != null && ((InternalEList.Unsettable<?>)values).isSet();
+		return values != null && ((InternalEList.Unsettable<?>) values).isSet();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES:
-				return ((InternalEList<?>)getValues()).basicRemove(otherEnd, msgs);
+		case ReqIF10Package.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES:
+			return ((InternalEList<?>) getValues()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES:
-				return getValues();
+		case ReqIF10Package.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES:
+			return getValues();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES:
-				getValues().clear();
-				getValues().addAll((Collection<? extends AttributeValue>)newValue);
-				return;
+		case ReqIF10Package.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES:
+			getValues().clear();
+			getValues().addAll((Collection<? extends AttributeValue>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES:
-				unsetValues();
-				return;
+		case ReqIF10Package.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES:
+			unsetValues();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES:
-				return isSetValues();
+		case ReqIF10Package.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES:
+			return isSetValues();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //SpecElementWithAttributesImpl
+} // SpecElementWithAttributesImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecHierarchyImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecHierarchyImpl.java
index 7e1fac0..6b248b4 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecHierarchyImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecHierarchyImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,44 +15,37 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.rmf.reqif10.AttributeDefinition;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.SpecHierarchy;
 import org.eclipse.rmf.reqif10.SpecObject;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Spec Hierarchy</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Spec Hierarchy</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.SpecHierarchyImpl#isTableInternal <em>Table Internal</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.SpecHierarchyImpl#getObject <em>Object</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.SpecHierarchyImpl#getChildren <em>Children</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.SpecHierarchyImpl#getEditableAtts <em>Editable Atts</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.SpecHierarchyImpl#isTableInternal <em>Table Internal</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.SpecHierarchyImpl#getObject <em>Object</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.SpecHierarchyImpl#getChildren <em>Children</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.SpecHierarchyImpl#getEditableAtts <em>Editable Atts</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SpecHierarchyImpl extends AccessControlledElementImpl implements SpecHierarchy {
 	/**
-	 * The default value of the '{@link #isTableInternal() <em>Table Internal</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #isTableInternal() <em>Table Internal</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isTableInternal()
 	 * @generated
 	 * @ordered
@@ -60,9 +53,9 @@
 	protected static final boolean TABLE_INTERNAL_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isTableInternal() <em>Table Internal</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #isTableInternal() <em>Table Internal</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isTableInternal()
 	 * @generated
 	 * @ordered
@@ -70,18 +63,17 @@
 	protected boolean tableInternal = TABLE_INTERNAL_EDEFAULT;
 
 	/**
-	 * This is true if the Table Internal attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Table Internal attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean tableInternalESet;
 
 	/**
-	 * The cached value of the '{@link #getObject() <em>Object</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getObject() <em>Object</em>}' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getObject()
 	 * @generated
 	 * @ordered
@@ -89,18 +81,17 @@
 	protected SpecObject object;
 
 	/**
-	 * This is true if the Object reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Object reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean objectESet;
 
 	/**
-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getChildren()
 	 * @generated
 	 * @ordered
@@ -108,9 +99,9 @@
 	protected EList<SpecHierarchy> children;
 
 	/**
-	 * The cached value of the '{@link #getEditableAtts() <em>Editable Atts</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getEditableAtts() <em>Editable Atts</em>}' reference list. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getEditableAtts()
 	 * @generated
 	 * @ordered
@@ -118,8 +109,8 @@
 	protected EList<AttributeDefinition> editableAtts;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SpecHierarchyImpl() {
@@ -127,8 +118,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -137,8 +128,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isTableInternal() {
@@ -146,8 +137,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTableInternal(boolean newTableInternal) {
@@ -156,12 +147,13 @@
 		boolean oldTableInternalESet = tableInternalESet;
 		tableInternalESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.SPEC_HIERARCHY__TABLE_INTERNAL, oldTableInternal, tableInternal, !oldTableInternalESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.SPEC_HIERARCHY__TABLE_INTERNAL, oldTableInternal, tableInternal,
+					!oldTableInternalESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetTableInternal() {
@@ -170,12 +162,13 @@
 		tableInternal = TABLE_INTERNAL_EDEFAULT;
 		tableInternalESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.SPEC_HIERARCHY__TABLE_INTERNAL, oldTableInternal, TABLE_INTERNAL_EDEFAULT, oldTableInternalESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.SPEC_HIERARCHY__TABLE_INTERNAL, oldTableInternal,
+					TABLE_INTERNAL_EDEFAULT, oldTableInternalESet));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetTableInternal() {
@@ -183,14 +176,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecObject getObject() {
 		if (object != null && object.eIsProxy()) {
-			InternalEObject oldObject = (InternalEObject)object;
-			object = (SpecObject)eResolveProxy(oldObject);
+			InternalEObject oldObject = (InternalEObject) object;
+			object = (SpecObject) eResolveProxy(oldObject);
 			if (object != oldObject) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.SPEC_HIERARCHY__OBJECT, oldObject, object));
@@ -200,8 +193,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecObject basicGetObject() {
@@ -209,8 +202,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setObject(SpecObject newObject) {
@@ -223,8 +216,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetObject() {
@@ -237,8 +230,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetObject() {
@@ -246,8 +239,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<SpecHierarchy> getChildren() {
@@ -258,173 +251,181 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetChildren() {
-		if (children != null) ((InternalEList.Unsettable<?>)children).unset();
+		if (children != null)
+			((InternalEList.Unsettable<?>) children).unset();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetChildren() {
-		return children != null && ((InternalEList.Unsettable<?>)children).isSet();
+		return children != null && ((InternalEList.Unsettable<?>) children).isSet();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<AttributeDefinition> getEditableAtts() {
 		if (editableAtts == null) {
-			editableAtts = new EObjectResolvingEList.Unsettable<AttributeDefinition>(AttributeDefinition.class, this, ReqIF10Package.SPEC_HIERARCHY__EDITABLE_ATTS);
+			editableAtts = new EObjectResolvingEList.Unsettable<AttributeDefinition>(AttributeDefinition.class, this,
+					ReqIF10Package.SPEC_HIERARCHY__EDITABLE_ATTS);
 		}
 		return editableAtts;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetEditableAtts() {
-		if (editableAtts != null) ((InternalEList.Unsettable<?>)editableAtts).unset();
+		if (editableAtts != null)
+			((InternalEList.Unsettable<?>) editableAtts).unset();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetEditableAtts() {
-		return editableAtts != null && ((InternalEList.Unsettable<?>)editableAtts).isSet();
+		return editableAtts != null && ((InternalEList.Unsettable<?>) editableAtts).isSet();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_HIERARCHY__CHILDREN:
-				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+		case ReqIF10Package.SPEC_HIERARCHY__CHILDREN:
+			return ((InternalEList<?>) getChildren()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_HIERARCHY__TABLE_INTERNAL:
-				return isTableInternal();
-			case ReqIF10Package.SPEC_HIERARCHY__OBJECT:
-				if (resolve) return getObject();
-				return basicGetObject();
-			case ReqIF10Package.SPEC_HIERARCHY__CHILDREN:
-				return getChildren();
-			case ReqIF10Package.SPEC_HIERARCHY__EDITABLE_ATTS:
-				return getEditableAtts();
+		case ReqIF10Package.SPEC_HIERARCHY__TABLE_INTERNAL:
+			return isTableInternal();
+		case ReqIF10Package.SPEC_HIERARCHY__OBJECT:
+			if (resolve)
+				return getObject();
+			return basicGetObject();
+		case ReqIF10Package.SPEC_HIERARCHY__CHILDREN:
+			return getChildren();
+		case ReqIF10Package.SPEC_HIERARCHY__EDITABLE_ATTS:
+			return getEditableAtts();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_HIERARCHY__TABLE_INTERNAL:
-				setTableInternal((Boolean)newValue);
-				return;
-			case ReqIF10Package.SPEC_HIERARCHY__OBJECT:
-				setObject((SpecObject)newValue);
-				return;
-			case ReqIF10Package.SPEC_HIERARCHY__CHILDREN:
-				getChildren().clear();
-				getChildren().addAll((Collection<? extends SpecHierarchy>)newValue);
-				return;
-			case ReqIF10Package.SPEC_HIERARCHY__EDITABLE_ATTS:
-				getEditableAtts().clear();
-				getEditableAtts().addAll((Collection<? extends AttributeDefinition>)newValue);
-				return;
+		case ReqIF10Package.SPEC_HIERARCHY__TABLE_INTERNAL:
+			setTableInternal((Boolean) newValue);
+			return;
+		case ReqIF10Package.SPEC_HIERARCHY__OBJECT:
+			setObject((SpecObject) newValue);
+			return;
+		case ReqIF10Package.SPEC_HIERARCHY__CHILDREN:
+			getChildren().clear();
+			getChildren().addAll((Collection<? extends SpecHierarchy>) newValue);
+			return;
+		case ReqIF10Package.SPEC_HIERARCHY__EDITABLE_ATTS:
+			getEditableAtts().clear();
+			getEditableAtts().addAll((Collection<? extends AttributeDefinition>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_HIERARCHY__TABLE_INTERNAL:
-				unsetTableInternal();
-				return;
-			case ReqIF10Package.SPEC_HIERARCHY__OBJECT:
-				unsetObject();
-				return;
-			case ReqIF10Package.SPEC_HIERARCHY__CHILDREN:
-				unsetChildren();
-				return;
-			case ReqIF10Package.SPEC_HIERARCHY__EDITABLE_ATTS:
-				unsetEditableAtts();
-				return;
+		case ReqIF10Package.SPEC_HIERARCHY__TABLE_INTERNAL:
+			unsetTableInternal();
+			return;
+		case ReqIF10Package.SPEC_HIERARCHY__OBJECT:
+			unsetObject();
+			return;
+		case ReqIF10Package.SPEC_HIERARCHY__CHILDREN:
+			unsetChildren();
+			return;
+		case ReqIF10Package.SPEC_HIERARCHY__EDITABLE_ATTS:
+			unsetEditableAtts();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_HIERARCHY__TABLE_INTERNAL:
-				return isSetTableInternal();
-			case ReqIF10Package.SPEC_HIERARCHY__OBJECT:
-				return isSetObject();
-			case ReqIF10Package.SPEC_HIERARCHY__CHILDREN:
-				return isSetChildren();
-			case ReqIF10Package.SPEC_HIERARCHY__EDITABLE_ATTS:
-				return isSetEditableAtts();
+		case ReqIF10Package.SPEC_HIERARCHY__TABLE_INTERNAL:
+			return isSetTableInternal();
+		case ReqIF10Package.SPEC_HIERARCHY__OBJECT:
+			return isSetObject();
+		case ReqIF10Package.SPEC_HIERARCHY__CHILDREN:
+			return isSetChildren();
+		case ReqIF10Package.SPEC_HIERARCHY__EDITABLE_ATTS:
+			return isSetEditableAtts();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (tableInternal: ");
-		if (tableInternalESet) result.append(tableInternal); else result.append("<unset>");
+		result.append(" (tableInternal: "); //$NON-NLS-1$
+		if (tableInternalESet)
+			result.append(tableInternal);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-} //SpecHierarchyImpl
+} // SpecHierarchyImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecObjectImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecObjectImpl.java
index 812e228..4eb5022 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecObjectImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecObjectImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,34 +12,29 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.SpecObject;
 import org.eclipse.rmf.reqif10.SpecObjectType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Spec Object</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Spec Object</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.SpecObjectImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.SpecObjectImpl#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SpecObjectImpl extends SpecElementWithAttributesImpl implements SpecObject {
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -47,17 +42,16 @@
 	protected SpecObjectType type;
 
 	/**
-	 * This is true if the Type reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Type reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean typeESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SpecObjectImpl() {
@@ -65,8 +59,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -75,14 +69,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecObjectType getType() {
 		if (type != null && type.eIsProxy()) {
-			InternalEObject oldType = (InternalEObject)type;
-			type = (SpecObjectType)eResolveProxy(oldType);
+			InternalEObject oldType = (InternalEObject) type;
+			type = (SpecObjectType) eResolveProxy(oldType);
 			if (type != oldType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.SPEC_OBJECT__TYPE, oldType, type));
@@ -92,8 +86,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecObjectType basicGetType() {
@@ -101,8 +95,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(SpecObjectType newType) {
@@ -115,8 +109,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetType() {
@@ -129,8 +123,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetType() {
@@ -138,62 +132,63 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_OBJECT__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
+		case ReqIF10Package.SPEC_OBJECT__TYPE:
+			if (resolve)
+				return getType();
+			return basicGetType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_OBJECT__TYPE:
-				setType((SpecObjectType)newValue);
-				return;
+		case ReqIF10Package.SPEC_OBJECT__TYPE:
+			setType((SpecObjectType) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_OBJECT__TYPE:
-				unsetType();
-				return;
+		case ReqIF10Package.SPEC_OBJECT__TYPE:
+			unsetType();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_OBJECT__TYPE:
-				return isSetType();
+		case ReqIF10Package.SPEC_OBJECT__TYPE:
+			return isSetType();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //SpecObjectImpl
+} // SpecObjectImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecObjectTypeImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecObjectTypeImpl.java
index 45f938e..c3dcd0e 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecObjectTypeImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecObjectTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,23 +12,21 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.SpecObjectType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Spec Object Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Spec Object Type</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class SpecObjectTypeImpl extends SpecTypeImpl implements SpecObjectType {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SpecObjectTypeImpl() {
@@ -36,8 +34,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -45,4 +43,4 @@
 		return ReqIF10Package.Literals.SPEC_OBJECT_TYPE;
 	}
 
-} //SpecObjectTypeImpl
+} // SpecObjectTypeImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecRelationImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecRelationImpl.java
index dddae19..25724e9 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecRelationImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecRelationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,37 +12,32 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.SpecObject;
 import org.eclipse.rmf.reqif10.SpecRelation;
 import org.eclipse.rmf.reqif10.SpecRelationType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Spec Relation</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Spec Relation</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.SpecRelationImpl#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.SpecRelationImpl#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.SpecRelationImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.SpecRelationImpl#getTarget <em>Target</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.SpecRelationImpl#getSource <em>Source</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.SpecRelationImpl#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SpecRelationImpl extends SpecElementWithAttributesImpl implements SpecRelation {
 	/**
-	 * The cached value of the '{@link #getTarget() <em>Target</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTarget() <em>Target</em>}' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTarget()
 	 * @generated
 	 * @ordered
@@ -50,18 +45,17 @@
 	protected SpecObject target;
 
 	/**
-	 * This is true if the Target reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Target reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean targetESet;
 
 	/**
-	 * The cached value of the '{@link #getSource() <em>Source</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSource() <em>Source</em>}' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSource()
 	 * @generated
 	 * @ordered
@@ -69,18 +63,17 @@
 	protected SpecObject source;
 
 	/**
-	 * This is true if the Source reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Source reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean sourceESet;
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -88,17 +81,16 @@
 	protected SpecRelationType type;
 
 	/**
-	 * This is true if the Type reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Type reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean typeESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SpecRelationImpl() {
@@ -106,8 +98,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -116,14 +108,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecObject getTarget() {
 		if (target != null && target.eIsProxy()) {
-			InternalEObject oldTarget = (InternalEObject)target;
-			target = (SpecObject)eResolveProxy(oldTarget);
+			InternalEObject oldTarget = (InternalEObject) target;
+			target = (SpecObject) eResolveProxy(oldTarget);
 			if (target != oldTarget) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.SPEC_RELATION__TARGET, oldTarget, target));
@@ -133,8 +125,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecObject basicGetTarget() {
@@ -142,8 +134,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTarget(SpecObject newTarget) {
@@ -156,8 +148,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetTarget() {
@@ -170,8 +162,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetTarget() {
@@ -179,14 +171,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecObject getSource() {
 		if (source != null && source.eIsProxy()) {
-			InternalEObject oldSource = (InternalEObject)source;
-			source = (SpecObject)eResolveProxy(oldSource);
+			InternalEObject oldSource = (InternalEObject) source;
+			source = (SpecObject) eResolveProxy(oldSource);
 			if (source != oldSource) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.SPEC_RELATION__SOURCE, oldSource, source));
@@ -196,8 +188,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecObject basicGetSource() {
@@ -205,8 +197,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSource(SpecObject newSource) {
@@ -219,8 +211,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSource() {
@@ -233,8 +225,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSource() {
@@ -242,14 +234,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecRelationType getType() {
 		if (type != null && type.eIsProxy()) {
-			InternalEObject oldType = (InternalEObject)type;
-			type = (SpecRelationType)eResolveProxy(oldType);
+			InternalEObject oldType = (InternalEObject) type;
+			type = (SpecRelationType) eResolveProxy(oldType);
 			if (type != oldType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.SPEC_RELATION__TYPE, oldType, type));
@@ -259,8 +251,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecRelationType basicGetType() {
@@ -268,8 +260,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(SpecRelationType newType) {
@@ -282,8 +274,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetType() {
@@ -296,8 +288,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetType() {
@@ -305,84 +297,87 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_RELATION__TARGET:
-				if (resolve) return getTarget();
-				return basicGetTarget();
-			case ReqIF10Package.SPEC_RELATION__SOURCE:
-				if (resolve) return getSource();
-				return basicGetSource();
-			case ReqIF10Package.SPEC_RELATION__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
+		case ReqIF10Package.SPEC_RELATION__TARGET:
+			if (resolve)
+				return getTarget();
+			return basicGetTarget();
+		case ReqIF10Package.SPEC_RELATION__SOURCE:
+			if (resolve)
+				return getSource();
+			return basicGetSource();
+		case ReqIF10Package.SPEC_RELATION__TYPE:
+			if (resolve)
+				return getType();
+			return basicGetType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_RELATION__TARGET:
-				setTarget((SpecObject)newValue);
-				return;
-			case ReqIF10Package.SPEC_RELATION__SOURCE:
-				setSource((SpecObject)newValue);
-				return;
-			case ReqIF10Package.SPEC_RELATION__TYPE:
-				setType((SpecRelationType)newValue);
-				return;
+		case ReqIF10Package.SPEC_RELATION__TARGET:
+			setTarget((SpecObject) newValue);
+			return;
+		case ReqIF10Package.SPEC_RELATION__SOURCE:
+			setSource((SpecObject) newValue);
+			return;
+		case ReqIF10Package.SPEC_RELATION__TYPE:
+			setType((SpecRelationType) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_RELATION__TARGET:
-				unsetTarget();
-				return;
-			case ReqIF10Package.SPEC_RELATION__SOURCE:
-				unsetSource();
-				return;
-			case ReqIF10Package.SPEC_RELATION__TYPE:
-				unsetType();
-				return;
+		case ReqIF10Package.SPEC_RELATION__TARGET:
+			unsetTarget();
+			return;
+		case ReqIF10Package.SPEC_RELATION__SOURCE:
+			unsetSource();
+			return;
+		case ReqIF10Package.SPEC_RELATION__TYPE:
+			unsetType();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_RELATION__TARGET:
-				return isSetTarget();
-			case ReqIF10Package.SPEC_RELATION__SOURCE:
-				return isSetSource();
-			case ReqIF10Package.SPEC_RELATION__TYPE:
-				return isSetType();
+		case ReqIF10Package.SPEC_RELATION__TARGET:
+			return isSetTarget();
+		case ReqIF10Package.SPEC_RELATION__SOURCE:
+			return isSetSource();
+		case ReqIF10Package.SPEC_RELATION__TYPE:
+			return isSetType();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //SpecRelationImpl
+} // SpecRelationImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecRelationTypeImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecRelationTypeImpl.java
index 443d01e..2010c87 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecRelationTypeImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecRelationTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,23 +12,21 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.SpecRelationType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Spec Relation Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Spec Relation Type</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class SpecRelationTypeImpl extends SpecTypeImpl implements SpecRelationType {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SpecRelationTypeImpl() {
@@ -36,8 +34,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -45,4 +43,4 @@
 		return ReqIF10Package.Literals.SPEC_RELATION_TYPE;
 	}
 
-} //SpecRelationTypeImpl
+} // SpecRelationTypeImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecTypeImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecTypeImpl.java
index c0a4f3a..3c8c20a 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecTypeImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,37 +14,31 @@
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.rmf.reqif10.AttributeDefinition;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.SpecType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Spec Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Spec Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.SpecTypeImpl#getSpecAttributes <em>Spec Attributes</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.SpecTypeImpl#getSpecAttributes <em>Spec Attributes</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class SpecTypeImpl extends IdentifiableImpl implements SpecType {
 	/**
-	 * The cached value of the '{@link #getSpecAttributes() <em>Spec Attributes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSpecAttributes() <em>Spec Attributes</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSpecAttributes()
 	 * @generated
 	 * @ordered
@@ -52,8 +46,8 @@
 	protected EList<AttributeDefinition> specAttributes;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SpecTypeImpl() {
@@ -61,8 +55,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -71,107 +65,109 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<AttributeDefinition> getSpecAttributes() {
 		if (specAttributes == null) {
-			specAttributes = new EObjectContainmentEList.Unsettable<AttributeDefinition>(AttributeDefinition.class, this, ReqIF10Package.SPEC_TYPE__SPEC_ATTRIBUTES);
+			specAttributes = new EObjectContainmentEList.Unsettable<AttributeDefinition>(AttributeDefinition.class, this,
+					ReqIF10Package.SPEC_TYPE__SPEC_ATTRIBUTES);
 		}
 		return specAttributes;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetSpecAttributes() {
-		if (specAttributes != null) ((InternalEList.Unsettable<?>)specAttributes).unset();
+		if (specAttributes != null)
+			((InternalEList.Unsettable<?>) specAttributes).unset();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSpecAttributes() {
-		return specAttributes != null && ((InternalEList.Unsettable<?>)specAttributes).isSet();
+		return specAttributes != null && ((InternalEList.Unsettable<?>) specAttributes).isSet();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_TYPE__SPEC_ATTRIBUTES:
-				return ((InternalEList<?>)getSpecAttributes()).basicRemove(otherEnd, msgs);
+		case ReqIF10Package.SPEC_TYPE__SPEC_ATTRIBUTES:
+			return ((InternalEList<?>) getSpecAttributes()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_TYPE__SPEC_ATTRIBUTES:
-				return getSpecAttributes();
+		case ReqIF10Package.SPEC_TYPE__SPEC_ATTRIBUTES:
+			return getSpecAttributes();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_TYPE__SPEC_ATTRIBUTES:
-				getSpecAttributes().clear();
-				getSpecAttributes().addAll((Collection<? extends AttributeDefinition>)newValue);
-				return;
+		case ReqIF10Package.SPEC_TYPE__SPEC_ATTRIBUTES:
+			getSpecAttributes().clear();
+			getSpecAttributes().addAll((Collection<? extends AttributeDefinition>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_TYPE__SPEC_ATTRIBUTES:
-				unsetSpecAttributes();
-				return;
+		case ReqIF10Package.SPEC_TYPE__SPEC_ATTRIBUTES:
+			unsetSpecAttributes();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.SPEC_TYPE__SPEC_ATTRIBUTES:
-				return isSetSpecAttributes();
+		case ReqIF10Package.SPEC_TYPE__SPEC_ATTRIBUTES:
+			return isSetSpecAttributes();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //SpecTypeImpl
+} // SpecTypeImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecificationImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecificationImpl.java
index 5c944e8..f5b81bc 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecificationImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecificationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,41 +15,34 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.SpecHierarchy;
 import org.eclipse.rmf.reqif10.Specification;
 import org.eclipse.rmf.reqif10.SpecificationType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Specification</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Specification</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.SpecificationImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.SpecificationImpl#getChildren <em>Children</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.SpecificationImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.SpecificationImpl#getChildren <em>Children</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SpecificationImpl extends SpecElementWithAttributesImpl implements Specification {
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -57,18 +50,17 @@
 	protected SpecificationType type;
 
 	/**
-	 * This is true if the Type reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Type reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean typeESet;
 
 	/**
-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getChildren()
 	 * @generated
 	 * @ordered
@@ -76,8 +68,8 @@
 	protected EList<SpecHierarchy> children;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SpecificationImpl() {
@@ -85,8 +77,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -95,14 +87,14 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecificationType getType() {
 		if (type != null && type.eIsProxy()) {
-			InternalEObject oldType = (InternalEObject)type;
-			type = (SpecificationType)eResolveProxy(oldType);
+			InternalEObject oldType = (InternalEObject) type;
+			type = (SpecificationType) eResolveProxy(oldType);
 			if (type != oldType) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReqIF10Package.SPECIFICATION__TYPE, oldType, type));
@@ -112,8 +104,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SpecificationType basicGetType() {
@@ -121,8 +113,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(SpecificationType newType) {
@@ -135,8 +127,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetType() {
@@ -149,8 +141,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetType() {
@@ -158,8 +150,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<SpecHierarchy> getChildren() {
@@ -170,106 +162,108 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetChildren() {
-		if (children != null) ((InternalEList.Unsettable<?>)children).unset();
+		if (children != null)
+			((InternalEList.Unsettable<?>) children).unset();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetChildren() {
-		return children != null && ((InternalEList.Unsettable<?>)children).isSet();
+		return children != null && ((InternalEList.Unsettable<?>) children).isSet();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.SPECIFICATION__CHILDREN:
-				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+		case ReqIF10Package.SPECIFICATION__CHILDREN:
+			return ((InternalEList<?>) getChildren()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.SPECIFICATION__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case ReqIF10Package.SPECIFICATION__CHILDREN:
-				return getChildren();
+		case ReqIF10Package.SPECIFICATION__TYPE:
+			if (resolve)
+				return getType();
+			return basicGetType();
+		case ReqIF10Package.SPECIFICATION__CHILDREN:
+			return getChildren();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.SPECIFICATION__TYPE:
-				setType((SpecificationType)newValue);
-				return;
-			case ReqIF10Package.SPECIFICATION__CHILDREN:
-				getChildren().clear();
-				getChildren().addAll((Collection<? extends SpecHierarchy>)newValue);
-				return;
+		case ReqIF10Package.SPECIFICATION__TYPE:
+			setType((SpecificationType) newValue);
+			return;
+		case ReqIF10Package.SPECIFICATION__CHILDREN:
+			getChildren().clear();
+			getChildren().addAll((Collection<? extends SpecHierarchy>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.SPECIFICATION__TYPE:
-				unsetType();
-				return;
-			case ReqIF10Package.SPECIFICATION__CHILDREN:
-				unsetChildren();
-				return;
+		case ReqIF10Package.SPECIFICATION__TYPE:
+			unsetType();
+			return;
+		case ReqIF10Package.SPECIFICATION__CHILDREN:
+			unsetChildren();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.SPECIFICATION__TYPE:
-				return isSetType();
-			case ReqIF10Package.SPECIFICATION__CHILDREN:
-				return isSetChildren();
+		case ReqIF10Package.SPECIFICATION__TYPE:
+			return isSetType();
+		case ReqIF10Package.SPECIFICATION__CHILDREN:
+			return isSetChildren();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //SpecificationImpl
+} // SpecificationImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecificationTypeImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecificationTypeImpl.java
index 9165a72..9663fe0 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecificationTypeImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/SpecificationTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,23 +12,21 @@
 package org.eclipse.rmf.reqif10.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.SpecificationType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Specification Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Specification Type</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class SpecificationTypeImpl extends SpecTypeImpl implements SpecificationType {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SpecificationTypeImpl() {
@@ -36,8 +34,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -45,4 +43,4 @@
 		return ReqIF10Package.Literals.SPECIFICATION_TYPE;
 	}
 
-} //SpecificationTypeImpl
+} // SpecificationTypeImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/XhtmlContentImpl.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/XhtmlContentImpl.java
index 5639ba1..e629c67 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/XhtmlContentImpl.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/impl/XhtmlContentImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,36 +13,31 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.XhtmlContent;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Xhtml Content</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Xhtml Content</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.XhtmlContentImpl#getXhtml <em>Xhtml</em>}</li>
- *   <li>{@link org.eclipse.rmf.reqif10.impl.XhtmlContentImpl#getXhtmlSource <em>Xhtml Source</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.XhtmlContentImpl#getXhtml <em>Xhtml</em>}</li>
+ * <li>{@link org.eclipse.rmf.reqif10.impl.XhtmlContentImpl#getXhtmlSource <em>Xhtml Source</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class XhtmlContentImpl extends EObjectImpl implements XhtmlContent {
+public class XhtmlContentImpl extends MinimalEObjectImpl implements XhtmlContent {
 	/**
-	 * The cached value of the '{@link #getXhtml() <em>Xhtml</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getXhtml() <em>Xhtml</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getXhtml()
 	 * @generated
 	 * @ordered
@@ -50,18 +45,17 @@
 	protected EObject xhtml;
 
 	/**
-	 * This is true if the Xhtml containment reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Xhtml containment reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean xhtmlESet;
 
 	/**
-	 * The default value of the '{@link #getXhtmlSource() <em>Xhtml Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getXhtmlSource() <em>Xhtml Source</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getXhtmlSource()
 	 * @generated
 	 * @ordered
@@ -69,9 +63,9 @@
 	protected static final String XHTML_SOURCE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getXhtmlSource() <em>Xhtml Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getXhtmlSource() <em>Xhtml Source</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getXhtmlSource()
 	 * @generated
 	 * @ordered
@@ -79,17 +73,16 @@
 	protected String xhtmlSource = XHTML_SOURCE_EDEFAULT;
 
 	/**
-	 * This is true if the Xhtml Source attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is true if the Xhtml Source attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean xhtmlSourceESet;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected XhtmlContentImpl() {
@@ -97,8 +90,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -107,8 +100,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EObject getXhtml() {
@@ -116,8 +109,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetXhtml(EObject newXhtml, NotificationChain msgs) {
@@ -126,38 +119,47 @@
 		boolean oldXhtmlESet = xhtmlESet;
 		xhtmlESet = true;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.XHTML_CONTENT__XHTML, oldXhtml, newXhtml, !oldXhtmlESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReqIF10Package.XHTML_CONTENT__XHTML, oldXhtml, newXhtml,
+					!oldXhtmlESet);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setXhtml(EObject newXhtml) {
 		if (newXhtml != xhtml) {
 			NotificationChain msgs = null;
-			if (xhtml != null)
-				msgs = ((InternalEObject)xhtml).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.XHTML_CONTENT__XHTML, null, msgs);
-			if (newXhtml != null)
-				msgs = ((InternalEObject)newXhtml).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.XHTML_CONTENT__XHTML, null, msgs);
+			if (xhtml != null) {
+				msgs = ((InternalEObject) xhtml).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.XHTML_CONTENT__XHTML, null, msgs);
+			}
+			if (newXhtml != null) {
+				msgs = ((InternalEObject) newXhtml).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.XHTML_CONTENT__XHTML, null, msgs);
+			}
 			msgs = basicSetXhtml(newXhtml, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else {
 			boolean oldXhtmlESet = xhtmlESet;
 			xhtmlESet = true;
-			if (eNotificationRequired())
+			if (eNotificationRequired()) {
 				eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.XHTML_CONTENT__XHTML, newXhtml, newXhtml, !oldXhtmlESet));
+			}
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetXhtml(NotificationChain msgs) {
@@ -166,35 +168,42 @@
 		boolean oldXhtmlESet = xhtmlESet;
 		xhtmlESet = false;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.XHTML_CONTENT__XHTML, oldXhtml, null, oldXhtmlESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.XHTML_CONTENT__XHTML, oldXhtml, null,
+					oldXhtmlESet);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetXhtml() {
 		if (xhtml != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject)xhtml).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.XHTML_CONTENT__XHTML, null, msgs);
+			msgs = ((InternalEObject) xhtml).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReqIF10Package.XHTML_CONTENT__XHTML, null, msgs);
 			msgs = basicUnsetXhtml(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else {
 			boolean oldXhtmlESet = xhtmlESet;
 			xhtmlESet = false;
-			if (eNotificationRequired())
+			if (eNotificationRequired()) {
 				eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.XHTML_CONTENT__XHTML, null, null, oldXhtmlESet));
+			}
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetXhtml() {
@@ -202,8 +211,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getXhtmlSource() {
@@ -211,8 +220,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setXhtmlSource(String newXhtmlSource) {
@@ -220,13 +229,15 @@
 		xhtmlSource = newXhtmlSource;
 		boolean oldXhtmlSourceESet = xhtmlSourceESet;
 		xhtmlSourceESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.XHTML_CONTENT__XHTML_SOURCE, oldXhtmlSource, xhtmlSource, !oldXhtmlSourceESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ReqIF10Package.XHTML_CONTENT__XHTML_SOURCE, oldXhtmlSource, xhtmlSource,
+					!oldXhtmlSourceESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetXhtmlSource() {
@@ -234,13 +245,15 @@
 		boolean oldXhtmlSourceESet = xhtmlSourceESet;
 		xhtmlSource = XHTML_SOURCE_EDEFAULT;
 		xhtmlSourceESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.XHTML_CONTENT__XHTML_SOURCE, oldXhtmlSource, XHTML_SOURCE_EDEFAULT, oldXhtmlSourceESet));
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ReqIF10Package.XHTML_CONTENT__XHTML_SOURCE, oldXhtmlSource,
+					XHTML_SOURCE_EDEFAULT, oldXhtmlSourceESet));
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetXhtmlSource() {
@@ -248,101 +261,107 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ReqIF10Package.XHTML_CONTENT__XHTML:
-				return basicUnsetXhtml(msgs);
+		case ReqIF10Package.XHTML_CONTENT__XHTML:
+			return basicUnsetXhtml(msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ReqIF10Package.XHTML_CONTENT__XHTML:
-				return getXhtml();
-			case ReqIF10Package.XHTML_CONTENT__XHTML_SOURCE:
-				return getXhtmlSource();
+		case ReqIF10Package.XHTML_CONTENT__XHTML:
+			return getXhtml();
+		case ReqIF10Package.XHTML_CONTENT__XHTML_SOURCE:
+			return getXhtmlSource();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ReqIF10Package.XHTML_CONTENT__XHTML:
-				setXhtml((EObject)newValue);
-				return;
-			case ReqIF10Package.XHTML_CONTENT__XHTML_SOURCE:
-				setXhtmlSource((String)newValue);
-				return;
+		case ReqIF10Package.XHTML_CONTENT__XHTML:
+			setXhtml((EObject) newValue);
+			return;
+		case ReqIF10Package.XHTML_CONTENT__XHTML_SOURCE:
+			setXhtmlSource((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.XHTML_CONTENT__XHTML:
-				unsetXhtml();
-				return;
-			case ReqIF10Package.XHTML_CONTENT__XHTML_SOURCE:
-				unsetXhtmlSource();
-				return;
+		case ReqIF10Package.XHTML_CONTENT__XHTML:
+			unsetXhtml();
+			return;
+		case ReqIF10Package.XHTML_CONTENT__XHTML_SOURCE:
+			unsetXhtmlSource();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ReqIF10Package.XHTML_CONTENT__XHTML:
-				return isSetXhtml();
-			case ReqIF10Package.XHTML_CONTENT__XHTML_SOURCE:
-				return isSetXhtmlSource();
+		case ReqIF10Package.XHTML_CONTENT__XHTML:
+			return isSetXhtml();
+		case ReqIF10Package.XHTML_CONTENT__XHTML_SOURCE:
+			return isSetXhtmlSource();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy()) {
+			return super.toString();
+		}
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (xhtmlSource: ");
-		if (xhtmlSourceESet) result.append(xhtmlSource); else result.append("<unset>");
+		result.append(" (xhtmlSource: "); //$NON-NLS-1$
+		if (xhtmlSourceESet) {
+			result.append(xhtmlSource);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
 		result.append(')');
 		return result.toString();
 	}
 
-} //XhtmlContentImpl
+} // XhtmlContentImpl
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/util/ReqIF10AdapterFactory.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/util/ReqIF10AdapterFactory.java
index 0e601ef..c00e19f 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/util/ReqIF10AdapterFactory.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/util/ReqIF10AdapterFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,34 +13,76 @@
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
-
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
 import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.rmf.reqif10.*;
+import org.eclipse.rmf.reqif10.AccessControlledElement;
+import org.eclipse.rmf.reqif10.AlternativeID;
+import org.eclipse.rmf.reqif10.AttributeDefinition;
+import org.eclipse.rmf.reqif10.AttributeDefinitionBoolean;
+import org.eclipse.rmf.reqif10.AttributeDefinitionDate;
+import org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration;
+import org.eclipse.rmf.reqif10.AttributeDefinitionInteger;
+import org.eclipse.rmf.reqif10.AttributeDefinitionReal;
+import org.eclipse.rmf.reqif10.AttributeDefinitionSimple;
+import org.eclipse.rmf.reqif10.AttributeDefinitionString;
+import org.eclipse.rmf.reqif10.AttributeDefinitionXHTML;
+import org.eclipse.rmf.reqif10.AttributeValue;
+import org.eclipse.rmf.reqif10.AttributeValueBoolean;
+import org.eclipse.rmf.reqif10.AttributeValueDate;
+import org.eclipse.rmf.reqif10.AttributeValueEnumeration;
+import org.eclipse.rmf.reqif10.AttributeValueInteger;
+import org.eclipse.rmf.reqif10.AttributeValueReal;
+import org.eclipse.rmf.reqif10.AttributeValueSimple;
+import org.eclipse.rmf.reqif10.AttributeValueString;
+import org.eclipse.rmf.reqif10.AttributeValueXHTML;
+import org.eclipse.rmf.reqif10.DatatypeDefinition;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionDate;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionInteger;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionReal;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionSimple;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionString;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML;
+import org.eclipse.rmf.reqif10.EmbeddedValue;
+import org.eclipse.rmf.reqif10.EnumValue;
+import org.eclipse.rmf.reqif10.Identifiable;
+import org.eclipse.rmf.reqif10.RelationGroup;
+import org.eclipse.rmf.reqif10.RelationGroupType;
+import org.eclipse.rmf.reqif10.ReqIF;
+import org.eclipse.rmf.reqif10.ReqIF10Package;
+import org.eclipse.rmf.reqif10.ReqIFContent;
+import org.eclipse.rmf.reqif10.ReqIFHeader;
+import org.eclipse.rmf.reqif10.ReqIFToolExtension;
+import org.eclipse.rmf.reqif10.SpecElementWithAttributes;
+import org.eclipse.rmf.reqif10.SpecHierarchy;
+import org.eclipse.rmf.reqif10.SpecObject;
+import org.eclipse.rmf.reqif10.SpecObjectType;
+import org.eclipse.rmf.reqif10.SpecRelation;
+import org.eclipse.rmf.reqif10.SpecRelationType;
+import org.eclipse.rmf.reqif10.SpecType;
+import org.eclipse.rmf.reqif10.Specification;
+import org.eclipse.rmf.reqif10.SpecificationType;
+import org.eclipse.rmf.reqif10.XhtmlContent;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
+ * method for each class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package
  * @generated
  */
 public class ReqIF10AdapterFactory extends AdapterFactoryImpl {
 	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static ReqIF10Package modelPackage;
 
 	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ReqIF10AdapterFactory() {
@@ -50,10 +92,10 @@
 	}
 
 	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
+	 * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This
+	 * implementation returns <code>true</code> if the object is either the model's package or is an instance object of
+	 * the model. <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
@@ -63,237 +105,282 @@
 			return true;
 		}
 		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
+			return ((EObject) object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
 	}
 
 	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected ReqIF10Switch<Adapter> modelSwitch =
-		new ReqIF10Switch<Adapter>() {
-			@Override
-			public Adapter caseAccessControlledElement(AccessControlledElement object) {
-				return createAccessControlledElementAdapter();
-			}
-			@Override
-			public Adapter caseIdentifiable(Identifiable object) {
-				return createIdentifiableAdapter();
-			}
-			@Override
-			public Adapter caseAttributeValueXHTML(AttributeValueXHTML object) {
-				return createAttributeValueXHTMLAdapter();
-			}
-			@Override
-			public Adapter caseAttributeValue(AttributeValue object) {
-				return createAttributeValueAdapter();
-			}
-			@Override
-			public Adapter caseSpecElementWithAttributes(SpecElementWithAttributes object) {
-				return createSpecElementWithAttributesAdapter();
-			}
-			@Override
-			public Adapter caseAttributeDefinitionXHTML(AttributeDefinitionXHTML object) {
-				return createAttributeDefinitionXHTMLAdapter();
-			}
-			@Override
-			public Adapter caseAttributeDefinition(AttributeDefinition object) {
-				return createAttributeDefinitionAdapter();
-			}
-			@Override
-			public Adapter caseSpecType(SpecType object) {
-				return createSpecTypeAdapter();
-			}
-			@Override
-			public Adapter caseReqIFContent(ReqIFContent object) {
-				return createReqIFContentAdapter();
-			}
-			@Override
-			public Adapter caseReqIF(ReqIF object) {
-				return createReqIFAdapter();
-			}
-			@Override
-			public Adapter caseReqIFHeader(ReqIFHeader object) {
-				return createReqIFHeaderAdapter();
-			}
-			@Override
-			public Adapter caseReqIFToolExtension(ReqIFToolExtension object) {
-				return createReqIFToolExtensionAdapter();
-			}
-			@Override
-			public Adapter caseSpecObject(SpecObject object) {
-				return createSpecObjectAdapter();
-			}
-			@Override
-			public Adapter caseSpecObjectType(SpecObjectType object) {
-				return createSpecObjectTypeAdapter();
-			}
-			@Override
-			public Adapter caseSpecification(Specification object) {
-				return createSpecificationAdapter();
-			}
-			@Override
-			public Adapter caseSpecificationType(SpecificationType object) {
-				return createSpecificationTypeAdapter();
-			}
-			@Override
-			public Adapter caseSpecHierarchy(SpecHierarchy object) {
-				return createSpecHierarchyAdapter();
-			}
-			@Override
-			public Adapter caseDatatypeDefinition(DatatypeDefinition object) {
-				return createDatatypeDefinitionAdapter();
-			}
-			@Override
-			public Adapter caseSpecRelation(SpecRelation object) {
-				return createSpecRelationAdapter();
-			}
-			@Override
-			public Adapter caseSpecRelationType(SpecRelationType object) {
-				return createSpecRelationTypeAdapter();
-			}
-			@Override
-			public Adapter caseRelationGroup(RelationGroup object) {
-				return createRelationGroupAdapter();
-			}
-			@Override
-			public Adapter caseRelationGroupType(RelationGroupType object) {
-				return createRelationGroupTypeAdapter();
-			}
-			@Override
-			public Adapter caseDatatypeDefinitionXHTML(DatatypeDefinitionXHTML object) {
-				return createDatatypeDefinitionXHTMLAdapter();
-			}
-			@Override
-			public Adapter caseAlternativeID(AlternativeID object) {
-				return createAlternativeIDAdapter();
-			}
-			@Override
-			public Adapter caseAttributeDefinitionBoolean(AttributeDefinitionBoolean object) {
-				return createAttributeDefinitionBooleanAdapter();
-			}
-			@Override
-			public Adapter caseAttributeDefinitionSimple(AttributeDefinitionSimple object) {
-				return createAttributeDefinitionSimpleAdapter();
-			}
-			@Override
-			public Adapter caseDatatypeDefinitionBoolean(DatatypeDefinitionBoolean object) {
-				return createDatatypeDefinitionBooleanAdapter();
-			}
-			@Override
-			public Adapter caseDatatypeDefinitionSimple(DatatypeDefinitionSimple object) {
-				return createDatatypeDefinitionSimpleAdapter();
-			}
-			@Override
-			public Adapter caseAttributeValueBoolean(AttributeValueBoolean object) {
-				return createAttributeValueBooleanAdapter();
-			}
-			@Override
-			public Adapter caseAttributeValueSimple(AttributeValueSimple object) {
-				return createAttributeValueSimpleAdapter();
-			}
-			@Override
-			public Adapter caseAttributeDefinitionDate(AttributeDefinitionDate object) {
-				return createAttributeDefinitionDateAdapter();
-			}
-			@Override
-			public Adapter caseDatatypeDefinitionDate(DatatypeDefinitionDate object) {
-				return createDatatypeDefinitionDateAdapter();
-			}
-			@Override
-			public Adapter caseAttributeValueDate(AttributeValueDate object) {
-				return createAttributeValueDateAdapter();
-			}
-			@Override
-			public Adapter caseAttributeDefinitionEnumeration(AttributeDefinitionEnumeration object) {
-				return createAttributeDefinitionEnumerationAdapter();
-			}
-			@Override
-			public Adapter caseDatatypeDefinitionEnumeration(DatatypeDefinitionEnumeration object) {
-				return createDatatypeDefinitionEnumerationAdapter();
-			}
-			@Override
-			public Adapter caseEnumValue(EnumValue object) {
-				return createEnumValueAdapter();
-			}
-			@Override
-			public Adapter caseEmbeddedValue(EmbeddedValue object) {
-				return createEmbeddedValueAdapter();
-			}
-			@Override
-			public Adapter caseAttributeValueEnumeration(AttributeValueEnumeration object) {
-				return createAttributeValueEnumerationAdapter();
-			}
-			@Override
-			public Adapter caseAttributeDefinitionInteger(AttributeDefinitionInteger object) {
-				return createAttributeDefinitionIntegerAdapter();
-			}
-			@Override
-			public Adapter caseDatatypeDefinitionInteger(DatatypeDefinitionInteger object) {
-				return createDatatypeDefinitionIntegerAdapter();
-			}
-			@Override
-			public Adapter caseAttributeValueInteger(AttributeValueInteger object) {
-				return createAttributeValueIntegerAdapter();
-			}
-			@Override
-			public Adapter caseAttributeDefinitionReal(AttributeDefinitionReal object) {
-				return createAttributeDefinitionRealAdapter();
-			}
-			@Override
-			public Adapter caseDatatypeDefinitionReal(DatatypeDefinitionReal object) {
-				return createDatatypeDefinitionRealAdapter();
-			}
-			@Override
-			public Adapter caseAttributeValueReal(AttributeValueReal object) {
-				return createAttributeValueRealAdapter();
-			}
-			@Override
-			public Adapter caseAttributeDefinitionString(AttributeDefinitionString object) {
-				return createAttributeDefinitionStringAdapter();
-			}
-			@Override
-			public Adapter caseDatatypeDefinitionString(DatatypeDefinitionString object) {
-				return createDatatypeDefinitionStringAdapter();
-			}
-			@Override
-			public Adapter caseAttributeValueString(AttributeValueString object) {
-				return createAttributeValueStringAdapter();
-			}
-			@Override
-			public Adapter caseXhtmlContent(XhtmlContent object) {
-				return createXhtmlContentAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected ReqIF10Switch<Adapter> modelSwitch = new ReqIF10Switch<Adapter>() {
+		@Override
+		public Adapter caseAccessControlledElement(AccessControlledElement object) {
+			return createAccessControlledElementAdapter();
+		}
+
+		@Override
+		public Adapter caseIdentifiable(Identifiable object) {
+			return createIdentifiableAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeValueXHTML(AttributeValueXHTML object) {
+			return createAttributeValueXHTMLAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeValue(AttributeValue object) {
+			return createAttributeValueAdapter();
+		}
+
+		@Override
+		public Adapter caseSpecElementWithAttributes(SpecElementWithAttributes object) {
+			return createSpecElementWithAttributesAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeDefinitionXHTML(AttributeDefinitionXHTML object) {
+			return createAttributeDefinitionXHTMLAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeDefinition(AttributeDefinition object) {
+			return createAttributeDefinitionAdapter();
+		}
+
+		@Override
+		public Adapter caseSpecType(SpecType object) {
+			return createSpecTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseReqIFContent(ReqIFContent object) {
+			return createReqIFContentAdapter();
+		}
+
+		@Override
+		public Adapter caseReqIF(ReqIF object) {
+			return createReqIFAdapter();
+		}
+
+		@Override
+		public Adapter caseReqIFHeader(ReqIFHeader object) {
+			return createReqIFHeaderAdapter();
+		}
+
+		@Override
+		public Adapter caseReqIFToolExtension(ReqIFToolExtension object) {
+			return createReqIFToolExtensionAdapter();
+		}
+
+		@Override
+		public Adapter caseSpecObject(SpecObject object) {
+			return createSpecObjectAdapter();
+		}
+
+		@Override
+		public Adapter caseSpecObjectType(SpecObjectType object) {
+			return createSpecObjectTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseSpecification(Specification object) {
+			return createSpecificationAdapter();
+		}
+
+		@Override
+		public Adapter caseSpecificationType(SpecificationType object) {
+			return createSpecificationTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseSpecHierarchy(SpecHierarchy object) {
+			return createSpecHierarchyAdapter();
+		}
+
+		@Override
+		public Adapter caseDatatypeDefinition(DatatypeDefinition object) {
+			return createDatatypeDefinitionAdapter();
+		}
+
+		@Override
+		public Adapter caseSpecRelation(SpecRelation object) {
+			return createSpecRelationAdapter();
+		}
+
+		@Override
+		public Adapter caseSpecRelationType(SpecRelationType object) {
+			return createSpecRelationTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseRelationGroup(RelationGroup object) {
+			return createRelationGroupAdapter();
+		}
+
+		@Override
+		public Adapter caseRelationGroupType(RelationGroupType object) {
+			return createRelationGroupTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseDatatypeDefinitionXHTML(DatatypeDefinitionXHTML object) {
+			return createDatatypeDefinitionXHTMLAdapter();
+		}
+
+		@Override
+		public Adapter caseAlternativeID(AlternativeID object) {
+			return createAlternativeIDAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeDefinitionBoolean(AttributeDefinitionBoolean object) {
+			return createAttributeDefinitionBooleanAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeDefinitionSimple(AttributeDefinitionSimple object) {
+			return createAttributeDefinitionSimpleAdapter();
+		}
+
+		@Override
+		public Adapter caseDatatypeDefinitionBoolean(DatatypeDefinitionBoolean object) {
+			return createDatatypeDefinitionBooleanAdapter();
+		}
+
+		@Override
+		public Adapter caseDatatypeDefinitionSimple(DatatypeDefinitionSimple object) {
+			return createDatatypeDefinitionSimpleAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeValueBoolean(AttributeValueBoolean object) {
+			return createAttributeValueBooleanAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeValueSimple(AttributeValueSimple object) {
+			return createAttributeValueSimpleAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeDefinitionDate(AttributeDefinitionDate object) {
+			return createAttributeDefinitionDateAdapter();
+		}
+
+		@Override
+		public Adapter caseDatatypeDefinitionDate(DatatypeDefinitionDate object) {
+			return createDatatypeDefinitionDateAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeValueDate(AttributeValueDate object) {
+			return createAttributeValueDateAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeDefinitionEnumeration(AttributeDefinitionEnumeration object) {
+			return createAttributeDefinitionEnumerationAdapter();
+		}
+
+		@Override
+		public Adapter caseDatatypeDefinitionEnumeration(DatatypeDefinitionEnumeration object) {
+			return createDatatypeDefinitionEnumerationAdapter();
+		}
+
+		@Override
+		public Adapter caseEnumValue(EnumValue object) {
+			return createEnumValueAdapter();
+		}
+
+		@Override
+		public Adapter caseEmbeddedValue(EmbeddedValue object) {
+			return createEmbeddedValueAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeValueEnumeration(AttributeValueEnumeration object) {
+			return createAttributeValueEnumerationAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeDefinitionInteger(AttributeDefinitionInteger object) {
+			return createAttributeDefinitionIntegerAdapter();
+		}
+
+		@Override
+		public Adapter caseDatatypeDefinitionInteger(DatatypeDefinitionInteger object) {
+			return createDatatypeDefinitionIntegerAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeValueInteger(AttributeValueInteger object) {
+			return createAttributeValueIntegerAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeDefinitionReal(AttributeDefinitionReal object) {
+			return createAttributeDefinitionRealAdapter();
+		}
+
+		@Override
+		public Adapter caseDatatypeDefinitionReal(DatatypeDefinitionReal object) {
+			return createDatatypeDefinitionRealAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeValueReal(AttributeValueReal object) {
+			return createAttributeValueRealAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeDefinitionString(AttributeDefinitionString object) {
+			return createAttributeDefinitionStringAdapter();
+		}
+
+		@Override
+		public Adapter caseDatatypeDefinitionString(DatatypeDefinitionString object) {
+			return createDatatypeDefinitionStringAdapter();
+		}
+
+		@Override
+		public Adapter caseAttributeValueString(AttributeValueString object) {
+			return createAttributeValueStringAdapter();
+		}
+
+		@Override
+		public Adapter caseXhtmlContent(XhtmlContent object) {
+			return createXhtmlContentAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param target
+	 *            the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
 	@Override
 	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
+		return modelSwitch.doSwitch((EObject) target);
 	}
 
-
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AccessControlledElement <em>Access Controlled Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AccessControlledElement
+	 * <em>Access Controlled Element</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AccessControlledElement
 	 * @generated
@@ -303,11 +390,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.Identifiable <em>Identifiable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.Identifiable <em>Identifiable</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.Identifiable
 	 * @generated
@@ -317,11 +403,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML <em>Attribute Value XHTML</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValueXHTML
+	 * <em>Attribute Value XHTML</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueXHTML
 	 * @generated
@@ -331,11 +417,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValue <em>Attribute Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValue
+	 * <em>Attribute Value</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeValue
 	 * @generated
@@ -345,11 +431,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.SpecElementWithAttributes <em>Spec Element With Attributes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.SpecElementWithAttributes
+	 * <em>Spec Element With Attributes</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
+	 * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.SpecElementWithAttributes
 	 * @generated
@@ -359,11 +445,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML <em>Attribute Definition XHTML</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionXHTML
+	 * <em>Attribute Definition XHTML</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
+	 * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionXHTML
 	 * @generated
@@ -373,11 +459,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinition <em>Attribute Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinition
+	 * <em>Attribute Definition</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinition
 	 * @generated
@@ -387,11 +473,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.SpecType <em>Spec Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.SpecType <em>Spec Type</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
+	 * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.SpecType
 	 * @generated
@@ -401,11 +486,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.ReqIFContent <em>Req IF Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.ReqIFContent
+	 * <em>Req IF Content</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.ReqIFContent
 	 * @generated
@@ -415,11 +500,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.ReqIF <em>Req IF</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.ReqIF <em>Req IF</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
+	 * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.ReqIF
 	 * @generated
@@ -429,11 +513,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.ReqIFHeader <em>Req IF Header</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.ReqIFHeader <em>Req IF Header</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.ReqIFHeader
 	 * @generated
@@ -443,11 +526,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.ReqIFToolExtension <em>Req IF Tool Extension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.ReqIFToolExtension
+	 * <em>Req IF Tool Extension</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.ReqIFToolExtension
 	 * @generated
@@ -458,10 +541,9 @@
 
 	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.SpecObject <em>Spec Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful
+	 * to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.SpecObject
 	 * @generated
@@ -471,11 +553,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.SpecObjectType <em>Spec Object Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.SpecObjectType
+	 * <em>Spec Object Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.SpecObjectType
 	 * @generated
@@ -485,11 +567,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.Specification <em>Specification</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.Specification
+	 * <em>Specification</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.Specification
 	 * @generated
@@ -499,11 +581,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.SpecificationType <em>Specification Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.SpecificationType
+	 * <em>Specification Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.SpecificationType
 	 * @generated
@@ -513,11 +595,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.SpecHierarchy <em>Spec Hierarchy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.SpecHierarchy
+	 * <em>Spec Hierarchy</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.SpecHierarchy
 	 * @generated
@@ -527,11 +609,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinition <em>Datatype Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinition
+	 * <em>Datatype Definition</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinition
 	 * @generated
@@ -541,11 +623,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.SpecRelation <em>Spec Relation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.SpecRelation <em>Spec Relation</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.SpecRelation
 	 * @generated
@@ -555,11 +636,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.SpecRelationType <em>Spec Relation Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.SpecRelationType
+	 * <em>Spec Relation Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.SpecRelationType
 	 * @generated
@@ -569,11 +650,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.RelationGroup <em>Relation Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.RelationGroup
+	 * <em>Relation Group</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.RelationGroup
 	 * @generated
@@ -583,11 +664,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.RelationGroupType <em>Relation Group Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.RelationGroupType
+	 * <em>Relation Group Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.RelationGroupType
 	 * @generated
@@ -597,11 +678,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML <em>Datatype Definition XHTML</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML
+	 * <em>Datatype Definition XHTML</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML
 	 * @generated
@@ -611,11 +692,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AlternativeID <em>Alternative ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AlternativeID
+	 * <em>Alternative ID</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AlternativeID
 	 * @generated
@@ -625,11 +706,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean <em>Attribute Definition Boolean</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionBoolean
+	 * <em>Attribute Definition Boolean</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
+	 * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionBoolean
 	 * @generated
@@ -639,11 +720,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionSimple <em>Attribute Definition Simple</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionSimple
+	 * <em>Attribute Definition Simple</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
+	 * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionSimple
 	 * @generated
@@ -653,11 +734,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean <em>Datatype Definition Boolean</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean
+	 * <em>Datatype Definition Boolean</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
+	 * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean
 	 * @generated
@@ -667,11 +748,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionSimple <em>Datatype Definition Simple</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionSimple
+	 * <em>Datatype Definition Simple</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
+	 * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionSimple
 	 * @generated
@@ -681,11 +762,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean <em>Attribute Value Boolean</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValueBoolean
+	 * <em>Attribute Value Boolean</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueBoolean
 	 * @generated
@@ -695,11 +776,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValueSimple <em>Attribute Value Simple</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValueSimple
+	 * <em>Attribute Value Simple</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueSimple
 	 * @generated
@@ -709,11 +790,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate <em>Attribute Definition Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionDate
+	 * <em>Attribute Definition Date</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionDate
 	 * @generated
@@ -723,11 +804,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionDate <em>Datatype Definition Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionDate
+	 * <em>Datatype Definition Date</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionDate
 	 * @generated
@@ -737,11 +818,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValueDate <em>Attribute Value Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValueDate
+	 * <em>Attribute Value Date</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueDate
 	 * @generated
@@ -751,11 +832,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration <em>Attribute Definition Enumeration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration
+	 * <em>Attribute Definition Enumeration</em>}'. <!-- begin-user-doc --> This default implementation returns null so
+	 * that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration
 	 * @generated
@@ -765,11 +846,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration <em>Datatype Definition Enumeration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration
+	 * <em>Datatype Definition Enumeration</em>}'. <!-- begin-user-doc --> This default implementation returns null so
+	 * that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration
 	 * @generated
@@ -780,10 +861,9 @@
 
 	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.EnumValue <em>Enum Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful
+	 * to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.EnumValue
 	 * @generated
@@ -793,11 +873,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.EmbeddedValue <em>Embedded Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.EmbeddedValue
+	 * <em>Embedded Value</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.EmbeddedValue
 	 * @generated
@@ -807,11 +887,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration <em>Attribute Value Enumeration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValueEnumeration
+	 * <em>Attribute Value Enumeration</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
+	 * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueEnumeration
 	 * @generated
@@ -821,11 +901,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger <em>Attribute Definition Integer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionInteger
+	 * <em>Attribute Definition Integer</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
+	 * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionInteger
 	 * @generated
@@ -835,11 +915,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger <em>Datatype Definition Integer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionInteger
+	 * <em>Datatype Definition Integer</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
+	 * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionInteger
 	 * @generated
@@ -849,11 +929,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValueInteger <em>Attribute Value Integer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValueInteger
+	 * <em>Attribute Value Integer</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueInteger
 	 * @generated
@@ -863,11 +943,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal <em>Attribute Definition Real</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionReal
+	 * <em>Attribute Definition Real</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionReal
 	 * @generated
@@ -877,11 +957,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal <em>Datatype Definition Real</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionReal
+	 * <em>Datatype Definition Real</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionReal
 	 * @generated
@@ -891,11 +971,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValueReal <em>Attribute Value Real</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValueReal
+	 * <em>Attribute Value Real</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueReal
 	 * @generated
@@ -905,11 +985,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString <em>Attribute Definition String</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeDefinitionString
+	 * <em>Attribute Definition String</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
+	 * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeDefinitionString
 	 * @generated
@@ -919,11 +999,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionString <em>Datatype Definition String</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.DatatypeDefinitionString
+	 * <em>Datatype Definition String</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
+	 * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.DatatypeDefinitionString
 	 * @generated
@@ -933,11 +1013,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValueString <em>Attribute Value String</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.AttributeValueString
+	 * <em>Attribute Value String</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.AttributeValueString
 	 * @generated
@@ -947,11 +1027,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.XhtmlContent <em>Xhtml Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.XhtmlContent <em>Xhtml Content</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.rmf.reqif10.XhtmlContent
 	 * @generated
@@ -961,10 +1040,9 @@
 	}
 
 	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
+	 * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -972,4 +1050,4 @@
 		return null;
 	}
 
-} //ReqIF10AdapterFactory
+} // ReqIF10AdapterFactory
diff --git a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/util/ReqIF10Switch.java b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/util/ReqIF10Switch.java
index bd43f14..ca96de8 100644
--- a/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/util/ReqIF10Switch.java
+++ b/org.eclipse.rmf.reqif10/src/org/eclipse/rmf/reqif10/util/ReqIF10Switch.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,37 +13,77 @@
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.util.Switch;
-
-import org.eclipse.rmf.reqif10.*;
+import org.eclipse.rmf.reqif10.AccessControlledElement;
+import org.eclipse.rmf.reqif10.AlternativeID;
+import org.eclipse.rmf.reqif10.AttributeDefinition;
+import org.eclipse.rmf.reqif10.AttributeDefinitionBoolean;
+import org.eclipse.rmf.reqif10.AttributeDefinitionDate;
+import org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration;
+import org.eclipse.rmf.reqif10.AttributeDefinitionInteger;
+import org.eclipse.rmf.reqif10.AttributeDefinitionReal;
+import org.eclipse.rmf.reqif10.AttributeDefinitionSimple;
+import org.eclipse.rmf.reqif10.AttributeDefinitionString;
+import org.eclipse.rmf.reqif10.AttributeDefinitionXHTML;
+import org.eclipse.rmf.reqif10.AttributeValue;
+import org.eclipse.rmf.reqif10.AttributeValueBoolean;
+import org.eclipse.rmf.reqif10.AttributeValueDate;
+import org.eclipse.rmf.reqif10.AttributeValueEnumeration;
+import org.eclipse.rmf.reqif10.AttributeValueInteger;
+import org.eclipse.rmf.reqif10.AttributeValueReal;
+import org.eclipse.rmf.reqif10.AttributeValueSimple;
+import org.eclipse.rmf.reqif10.AttributeValueString;
+import org.eclipse.rmf.reqif10.AttributeValueXHTML;
+import org.eclipse.rmf.reqif10.DatatypeDefinition;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionBoolean;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionDate;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionInteger;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionReal;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionSimple;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionString;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML;
+import org.eclipse.rmf.reqif10.EmbeddedValue;
+import org.eclipse.rmf.reqif10.EnumValue;
+import org.eclipse.rmf.reqif10.Identifiable;
+import org.eclipse.rmf.reqif10.RelationGroup;
+import org.eclipse.rmf.reqif10.RelationGroupType;
+import org.eclipse.rmf.reqif10.ReqIF;
+import org.eclipse.rmf.reqif10.ReqIF10Package;
+import org.eclipse.rmf.reqif10.ReqIFContent;
+import org.eclipse.rmf.reqif10.ReqIFHeader;
+import org.eclipse.rmf.reqif10.ReqIFToolExtension;
+import org.eclipse.rmf.reqif10.SpecElementWithAttributes;
+import org.eclipse.rmf.reqif10.SpecHierarchy;
+import org.eclipse.rmf.reqif10.SpecObject;
+import org.eclipse.rmf.reqif10.SpecObjectType;
+import org.eclipse.rmf.reqif10.SpecRelation;
+import org.eclipse.rmf.reqif10.SpecRelationType;
+import org.eclipse.rmf.reqif10.SpecType;
+import org.eclipse.rmf.reqif10.Specification;
+import org.eclipse.rmf.reqif10.SpecificationType;
+import org.eclipse.rmf.reqif10.XhtmlContent;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
+ * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
+ * returned, which is the result of the switch. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.rmf.reqif10.ReqIF10Package
  * @generated
  */
 public class ReqIF10Switch<T> extends Switch<T> {
 	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static ReqIF10Package modelPackage;
 
 	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ReqIF10Switch() {
@@ -53,9 +93,8 @@
 	}
 
 	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Checks whether this is a switch for the given package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -66,401 +105,537 @@
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that
+	 * result. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-			case ReqIF10Package.ACCESS_CONTROLLED_ELEMENT: {
-				AccessControlledElement accessControlledElement = (AccessControlledElement)theEObject;
-				T result = caseAccessControlledElement(accessControlledElement);
-				if (result == null) result = caseIdentifiable(accessControlledElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.IDENTIFIABLE: {
-				Identifiable identifiable = (Identifiable)theEObject;
-				T result = caseIdentifiable(identifiable);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_VALUE_XHTML: {
-				AttributeValueXHTML attributeValueXHTML = (AttributeValueXHTML)theEObject;
-				T result = caseAttributeValueXHTML(attributeValueXHTML);
-				if (result == null) result = caseAttributeValue(attributeValueXHTML);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_VALUE: {
-				AttributeValue attributeValue = (AttributeValue)theEObject;
-				T result = caseAttributeValue(attributeValue);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.SPEC_ELEMENT_WITH_ATTRIBUTES: {
-				SpecElementWithAttributes specElementWithAttributes = (SpecElementWithAttributes)theEObject;
-				T result = caseSpecElementWithAttributes(specElementWithAttributes);
-				if (result == null) result = caseIdentifiable(specElementWithAttributes);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML: {
-				AttributeDefinitionXHTML attributeDefinitionXHTML = (AttributeDefinitionXHTML)theEObject;
-				T result = caseAttributeDefinitionXHTML(attributeDefinitionXHTML);
-				if (result == null) result = caseAttributeDefinition(attributeDefinitionXHTML);
-				if (result == null) result = caseAccessControlledElement(attributeDefinitionXHTML);
-				if (result == null) result = caseIdentifiable(attributeDefinitionXHTML);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_DEFINITION: {
-				AttributeDefinition attributeDefinition = (AttributeDefinition)theEObject;
-				T result = caseAttributeDefinition(attributeDefinition);
-				if (result == null) result = caseAccessControlledElement(attributeDefinition);
-				if (result == null) result = caseIdentifiable(attributeDefinition);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.SPEC_TYPE: {
-				SpecType specType = (SpecType)theEObject;
-				T result = caseSpecType(specType);
-				if (result == null) result = caseIdentifiable(specType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.REQ_IF_CONTENT: {
-				ReqIFContent reqIFContent = (ReqIFContent)theEObject;
-				T result = caseReqIFContent(reqIFContent);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.REQ_IF: {
-				ReqIF reqIF = (ReqIF)theEObject;
-				T result = caseReqIF(reqIF);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.REQ_IF_HEADER: {
-				ReqIFHeader reqIFHeader = (ReqIFHeader)theEObject;
-				T result = caseReqIFHeader(reqIFHeader);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.REQ_IF_TOOL_EXTENSION: {
-				ReqIFToolExtension reqIFToolExtension = (ReqIFToolExtension)theEObject;
-				T result = caseReqIFToolExtension(reqIFToolExtension);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.SPEC_OBJECT: {
-				SpecObject specObject = (SpecObject)theEObject;
-				T result = caseSpecObject(specObject);
-				if (result == null) result = caseSpecElementWithAttributes(specObject);
-				if (result == null) result = caseIdentifiable(specObject);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.SPEC_OBJECT_TYPE: {
-				SpecObjectType specObjectType = (SpecObjectType)theEObject;
-				T result = caseSpecObjectType(specObjectType);
-				if (result == null) result = caseSpecType(specObjectType);
-				if (result == null) result = caseIdentifiable(specObjectType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.SPECIFICATION: {
-				Specification specification = (Specification)theEObject;
-				T result = caseSpecification(specification);
-				if (result == null) result = caseSpecElementWithAttributes(specification);
-				if (result == null) result = caseIdentifiable(specification);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.SPECIFICATION_TYPE: {
-				SpecificationType specificationType = (SpecificationType)theEObject;
-				T result = caseSpecificationType(specificationType);
-				if (result == null) result = caseSpecType(specificationType);
-				if (result == null) result = caseIdentifiable(specificationType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.SPEC_HIERARCHY: {
-				SpecHierarchy specHierarchy = (SpecHierarchy)theEObject;
-				T result = caseSpecHierarchy(specHierarchy);
-				if (result == null) result = caseAccessControlledElement(specHierarchy);
-				if (result == null) result = caseIdentifiable(specHierarchy);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.DATATYPE_DEFINITION: {
-				DatatypeDefinition datatypeDefinition = (DatatypeDefinition)theEObject;
-				T result = caseDatatypeDefinition(datatypeDefinition);
-				if (result == null) result = caseIdentifiable(datatypeDefinition);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.SPEC_RELATION: {
-				SpecRelation specRelation = (SpecRelation)theEObject;
-				T result = caseSpecRelation(specRelation);
-				if (result == null) result = caseSpecElementWithAttributes(specRelation);
-				if (result == null) result = caseIdentifiable(specRelation);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.SPEC_RELATION_TYPE: {
-				SpecRelationType specRelationType = (SpecRelationType)theEObject;
-				T result = caseSpecRelationType(specRelationType);
-				if (result == null) result = caseSpecType(specRelationType);
-				if (result == null) result = caseIdentifiable(specRelationType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.RELATION_GROUP: {
-				RelationGroup relationGroup = (RelationGroup)theEObject;
-				T result = caseRelationGroup(relationGroup);
-				if (result == null) result = caseIdentifiable(relationGroup);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.RELATION_GROUP_TYPE: {
-				RelationGroupType relationGroupType = (RelationGroupType)theEObject;
-				T result = caseRelationGroupType(relationGroupType);
-				if (result == null) result = caseSpecType(relationGroupType);
-				if (result == null) result = caseIdentifiable(relationGroupType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.DATATYPE_DEFINITION_XHTML: {
-				DatatypeDefinitionXHTML datatypeDefinitionXHTML = (DatatypeDefinitionXHTML)theEObject;
-				T result = caseDatatypeDefinitionXHTML(datatypeDefinitionXHTML);
-				if (result == null) result = caseDatatypeDefinition(datatypeDefinitionXHTML);
-				if (result == null) result = caseIdentifiable(datatypeDefinitionXHTML);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ALTERNATIVE_ID: {
-				AlternativeID alternativeID = (AlternativeID)theEObject;
-				T result = caseAlternativeID(alternativeID);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN: {
-				AttributeDefinitionBoolean attributeDefinitionBoolean = (AttributeDefinitionBoolean)theEObject;
-				T result = caseAttributeDefinitionBoolean(attributeDefinitionBoolean);
-				if (result == null) result = caseAttributeDefinitionSimple(attributeDefinitionBoolean);
-				if (result == null) result = caseAttributeDefinition(attributeDefinitionBoolean);
-				if (result == null) result = caseAccessControlledElement(attributeDefinitionBoolean);
-				if (result == null) result = caseIdentifiable(attributeDefinitionBoolean);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_SIMPLE: {
-				AttributeDefinitionSimple attributeDefinitionSimple = (AttributeDefinitionSimple)theEObject;
-				T result = caseAttributeDefinitionSimple(attributeDefinitionSimple);
-				if (result == null) result = caseAttributeDefinition(attributeDefinitionSimple);
-				if (result == null) result = caseAccessControlledElement(attributeDefinitionSimple);
-				if (result == null) result = caseIdentifiable(attributeDefinitionSimple);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.DATATYPE_DEFINITION_BOOLEAN: {
-				DatatypeDefinitionBoolean datatypeDefinitionBoolean = (DatatypeDefinitionBoolean)theEObject;
-				T result = caseDatatypeDefinitionBoolean(datatypeDefinitionBoolean);
-				if (result == null) result = caseDatatypeDefinitionSimple(datatypeDefinitionBoolean);
-				if (result == null) result = caseDatatypeDefinition(datatypeDefinitionBoolean);
-				if (result == null) result = caseIdentifiable(datatypeDefinitionBoolean);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.DATATYPE_DEFINITION_SIMPLE: {
-				DatatypeDefinitionSimple datatypeDefinitionSimple = (DatatypeDefinitionSimple)theEObject;
-				T result = caseDatatypeDefinitionSimple(datatypeDefinitionSimple);
-				if (result == null) result = caseDatatypeDefinition(datatypeDefinitionSimple);
-				if (result == null) result = caseIdentifiable(datatypeDefinitionSimple);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN: {
-				AttributeValueBoolean attributeValueBoolean = (AttributeValueBoolean)theEObject;
-				T result = caseAttributeValueBoolean(attributeValueBoolean);
-				if (result == null) result = caseAttributeValueSimple(attributeValueBoolean);
-				if (result == null) result = caseAttributeValue(attributeValueBoolean);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_VALUE_SIMPLE: {
-				AttributeValueSimple attributeValueSimple = (AttributeValueSimple)theEObject;
-				T result = caseAttributeValueSimple(attributeValueSimple);
-				if (result == null) result = caseAttributeValue(attributeValueSimple);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE: {
-				AttributeDefinitionDate attributeDefinitionDate = (AttributeDefinitionDate)theEObject;
-				T result = caseAttributeDefinitionDate(attributeDefinitionDate);
-				if (result == null) result = caseAttributeDefinitionSimple(attributeDefinitionDate);
-				if (result == null) result = caseAttributeDefinition(attributeDefinitionDate);
-				if (result == null) result = caseAccessControlledElement(attributeDefinitionDate);
-				if (result == null) result = caseIdentifiable(attributeDefinitionDate);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.DATATYPE_DEFINITION_DATE: {
-				DatatypeDefinitionDate datatypeDefinitionDate = (DatatypeDefinitionDate)theEObject;
-				T result = caseDatatypeDefinitionDate(datatypeDefinitionDate);
-				if (result == null) result = caseDatatypeDefinitionSimple(datatypeDefinitionDate);
-				if (result == null) result = caseDatatypeDefinition(datatypeDefinitionDate);
-				if (result == null) result = caseIdentifiable(datatypeDefinitionDate);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_VALUE_DATE: {
-				AttributeValueDate attributeValueDate = (AttributeValueDate)theEObject;
-				T result = caseAttributeValueDate(attributeValueDate);
-				if (result == null) result = caseAttributeValueSimple(attributeValueDate);
-				if (result == null) result = caseAttributeValue(attributeValueDate);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION: {
-				AttributeDefinitionEnumeration attributeDefinitionEnumeration = (AttributeDefinitionEnumeration)theEObject;
-				T result = caseAttributeDefinitionEnumeration(attributeDefinitionEnumeration);
-				if (result == null) result = caseAttributeDefinition(attributeDefinitionEnumeration);
-				if (result == null) result = caseAccessControlledElement(attributeDefinitionEnumeration);
-				if (result == null) result = caseIdentifiable(attributeDefinitionEnumeration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.DATATYPE_DEFINITION_ENUMERATION: {
-				DatatypeDefinitionEnumeration datatypeDefinitionEnumeration = (DatatypeDefinitionEnumeration)theEObject;
-				T result = caseDatatypeDefinitionEnumeration(datatypeDefinitionEnumeration);
-				if (result == null) result = caseDatatypeDefinition(datatypeDefinitionEnumeration);
-				if (result == null) result = caseIdentifiable(datatypeDefinitionEnumeration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ENUM_VALUE: {
-				EnumValue enumValue = (EnumValue)theEObject;
-				T result = caseEnumValue(enumValue);
-				if (result == null) result = caseIdentifiable(enumValue);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.EMBEDDED_VALUE: {
-				EmbeddedValue embeddedValue = (EmbeddedValue)theEObject;
-				T result = caseEmbeddedValue(embeddedValue);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION: {
-				AttributeValueEnumeration attributeValueEnumeration = (AttributeValueEnumeration)theEObject;
-				T result = caseAttributeValueEnumeration(attributeValueEnumeration);
-				if (result == null) result = caseAttributeValue(attributeValueEnumeration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER: {
-				AttributeDefinitionInteger attributeDefinitionInteger = (AttributeDefinitionInteger)theEObject;
-				T result = caseAttributeDefinitionInteger(attributeDefinitionInteger);
-				if (result == null) result = caseAttributeDefinitionSimple(attributeDefinitionInteger);
-				if (result == null) result = caseAttributeDefinition(attributeDefinitionInteger);
-				if (result == null) result = caseAccessControlledElement(attributeDefinitionInteger);
-				if (result == null) result = caseIdentifiable(attributeDefinitionInteger);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.DATATYPE_DEFINITION_INTEGER: {
-				DatatypeDefinitionInteger datatypeDefinitionInteger = (DatatypeDefinitionInteger)theEObject;
-				T result = caseDatatypeDefinitionInteger(datatypeDefinitionInteger);
-				if (result == null) result = caseDatatypeDefinitionSimple(datatypeDefinitionInteger);
-				if (result == null) result = caseDatatypeDefinition(datatypeDefinitionInteger);
-				if (result == null) result = caseIdentifiable(datatypeDefinitionInteger);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER: {
-				AttributeValueInteger attributeValueInteger = (AttributeValueInteger)theEObject;
-				T result = caseAttributeValueInteger(attributeValueInteger);
-				if (result == null) result = caseAttributeValueSimple(attributeValueInteger);
-				if (result == null) result = caseAttributeValue(attributeValueInteger);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL: {
-				AttributeDefinitionReal attributeDefinitionReal = (AttributeDefinitionReal)theEObject;
-				T result = caseAttributeDefinitionReal(attributeDefinitionReal);
-				if (result == null) result = caseAttributeDefinitionSimple(attributeDefinitionReal);
-				if (result == null) result = caseAttributeDefinition(attributeDefinitionReal);
-				if (result == null) result = caseAccessControlledElement(attributeDefinitionReal);
-				if (result == null) result = caseIdentifiable(attributeDefinitionReal);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.DATATYPE_DEFINITION_REAL: {
-				DatatypeDefinitionReal datatypeDefinitionReal = (DatatypeDefinitionReal)theEObject;
-				T result = caseDatatypeDefinitionReal(datatypeDefinitionReal);
-				if (result == null) result = caseDatatypeDefinitionSimple(datatypeDefinitionReal);
-				if (result == null) result = caseDatatypeDefinition(datatypeDefinitionReal);
-				if (result == null) result = caseIdentifiable(datatypeDefinitionReal);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_VALUE_REAL: {
-				AttributeValueReal attributeValueReal = (AttributeValueReal)theEObject;
-				T result = caseAttributeValueReal(attributeValueReal);
-				if (result == null) result = caseAttributeValueSimple(attributeValueReal);
-				if (result == null) result = caseAttributeValue(attributeValueReal);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING: {
-				AttributeDefinitionString attributeDefinitionString = (AttributeDefinitionString)theEObject;
-				T result = caseAttributeDefinitionString(attributeDefinitionString);
-				if (result == null) result = caseAttributeDefinitionSimple(attributeDefinitionString);
-				if (result == null) result = caseAttributeDefinition(attributeDefinitionString);
-				if (result == null) result = caseAccessControlledElement(attributeDefinitionString);
-				if (result == null) result = caseIdentifiable(attributeDefinitionString);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.DATATYPE_DEFINITION_STRING: {
-				DatatypeDefinitionString datatypeDefinitionString = (DatatypeDefinitionString)theEObject;
-				T result = caseDatatypeDefinitionString(datatypeDefinitionString);
-				if (result == null) result = caseDatatypeDefinitionSimple(datatypeDefinitionString);
-				if (result == null) result = caseDatatypeDefinition(datatypeDefinitionString);
-				if (result == null) result = caseIdentifiable(datatypeDefinitionString);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.ATTRIBUTE_VALUE_STRING: {
-				AttributeValueString attributeValueString = (AttributeValueString)theEObject;
-				T result = caseAttributeValueString(attributeValueString);
-				if (result == null) result = caseAttributeValueSimple(attributeValueString);
-				if (result == null) result = caseAttributeValue(attributeValueString);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ReqIF10Package.XHTML_CONTENT: {
-				XhtmlContent xhtmlContent = (XhtmlContent)theEObject;
-				T result = caseXhtmlContent(xhtmlContent);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		case ReqIF10Package.ACCESS_CONTROLLED_ELEMENT: {
+			AccessControlledElement accessControlledElement = (AccessControlledElement) theEObject;
+			T result = caseAccessControlledElement(accessControlledElement);
+			if (result == null)
+				result = caseIdentifiable(accessControlledElement);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.IDENTIFIABLE: {
+			Identifiable identifiable = (Identifiable) theEObject;
+			T result = caseIdentifiable(identifiable);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_VALUE_XHTML: {
+			AttributeValueXHTML attributeValueXHTML = (AttributeValueXHTML) theEObject;
+			T result = caseAttributeValueXHTML(attributeValueXHTML);
+			if (result == null)
+				result = caseAttributeValue(attributeValueXHTML);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_VALUE: {
+			AttributeValue attributeValue = (AttributeValue) theEObject;
+			T result = caseAttributeValue(attributeValue);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.SPEC_ELEMENT_WITH_ATTRIBUTES: {
+			SpecElementWithAttributes specElementWithAttributes = (SpecElementWithAttributes) theEObject;
+			T result = caseSpecElementWithAttributes(specElementWithAttributes);
+			if (result == null)
+				result = caseIdentifiable(specElementWithAttributes);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_XHTML: {
+			AttributeDefinitionXHTML attributeDefinitionXHTML = (AttributeDefinitionXHTML) theEObject;
+			T result = caseAttributeDefinitionXHTML(attributeDefinitionXHTML);
+			if (result == null)
+				result = caseAttributeDefinition(attributeDefinitionXHTML);
+			if (result == null)
+				result = caseAccessControlledElement(attributeDefinitionXHTML);
+			if (result == null)
+				result = caseIdentifiable(attributeDefinitionXHTML);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_DEFINITION: {
+			AttributeDefinition attributeDefinition = (AttributeDefinition) theEObject;
+			T result = caseAttributeDefinition(attributeDefinition);
+			if (result == null)
+				result = caseAccessControlledElement(attributeDefinition);
+			if (result == null)
+				result = caseIdentifiable(attributeDefinition);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.SPEC_TYPE: {
+			SpecType specType = (SpecType) theEObject;
+			T result = caseSpecType(specType);
+			if (result == null)
+				result = caseIdentifiable(specType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.REQ_IF_CONTENT: {
+			ReqIFContent reqIFContent = (ReqIFContent) theEObject;
+			T result = caseReqIFContent(reqIFContent);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.REQ_IF: {
+			ReqIF reqIF = (ReqIF) theEObject;
+			T result = caseReqIF(reqIF);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.REQ_IF_HEADER: {
+			ReqIFHeader reqIFHeader = (ReqIFHeader) theEObject;
+			T result = caseReqIFHeader(reqIFHeader);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.REQ_IF_TOOL_EXTENSION: {
+			ReqIFToolExtension reqIFToolExtension = (ReqIFToolExtension) theEObject;
+			T result = caseReqIFToolExtension(reqIFToolExtension);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.SPEC_OBJECT: {
+			SpecObject specObject = (SpecObject) theEObject;
+			T result = caseSpecObject(specObject);
+			if (result == null)
+				result = caseSpecElementWithAttributes(specObject);
+			if (result == null)
+				result = caseIdentifiable(specObject);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.SPEC_OBJECT_TYPE: {
+			SpecObjectType specObjectType = (SpecObjectType) theEObject;
+			T result = caseSpecObjectType(specObjectType);
+			if (result == null)
+				result = caseSpecType(specObjectType);
+			if (result == null)
+				result = caseIdentifiable(specObjectType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.SPECIFICATION: {
+			Specification specification = (Specification) theEObject;
+			T result = caseSpecification(specification);
+			if (result == null)
+				result = caseSpecElementWithAttributes(specification);
+			if (result == null)
+				result = caseIdentifiable(specification);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.SPECIFICATION_TYPE: {
+			SpecificationType specificationType = (SpecificationType) theEObject;
+			T result = caseSpecificationType(specificationType);
+			if (result == null)
+				result = caseSpecType(specificationType);
+			if (result == null)
+				result = caseIdentifiable(specificationType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.SPEC_HIERARCHY: {
+			SpecHierarchy specHierarchy = (SpecHierarchy) theEObject;
+			T result = caseSpecHierarchy(specHierarchy);
+			if (result == null)
+				result = caseAccessControlledElement(specHierarchy);
+			if (result == null)
+				result = caseIdentifiable(specHierarchy);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.DATATYPE_DEFINITION: {
+			DatatypeDefinition datatypeDefinition = (DatatypeDefinition) theEObject;
+			T result = caseDatatypeDefinition(datatypeDefinition);
+			if (result == null)
+				result = caseIdentifiable(datatypeDefinition);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.SPEC_RELATION: {
+			SpecRelation specRelation = (SpecRelation) theEObject;
+			T result = caseSpecRelation(specRelation);
+			if (result == null)
+				result = caseSpecElementWithAttributes(specRelation);
+			if (result == null)
+				result = caseIdentifiable(specRelation);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.SPEC_RELATION_TYPE: {
+			SpecRelationType specRelationType = (SpecRelationType) theEObject;
+			T result = caseSpecRelationType(specRelationType);
+			if (result == null)
+				result = caseSpecType(specRelationType);
+			if (result == null)
+				result = caseIdentifiable(specRelationType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.RELATION_GROUP: {
+			RelationGroup relationGroup = (RelationGroup) theEObject;
+			T result = caseRelationGroup(relationGroup);
+			if (result == null)
+				result = caseIdentifiable(relationGroup);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.RELATION_GROUP_TYPE: {
+			RelationGroupType relationGroupType = (RelationGroupType) theEObject;
+			T result = caseRelationGroupType(relationGroupType);
+			if (result == null)
+				result = caseSpecType(relationGroupType);
+			if (result == null)
+				result = caseIdentifiable(relationGroupType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.DATATYPE_DEFINITION_XHTML: {
+			DatatypeDefinitionXHTML datatypeDefinitionXHTML = (DatatypeDefinitionXHTML) theEObject;
+			T result = caseDatatypeDefinitionXHTML(datatypeDefinitionXHTML);
+			if (result == null)
+				result = caseDatatypeDefinition(datatypeDefinitionXHTML);
+			if (result == null)
+				result = caseIdentifiable(datatypeDefinitionXHTML);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ALTERNATIVE_ID: {
+			AlternativeID alternativeID = (AlternativeID) theEObject;
+			T result = caseAlternativeID(alternativeID);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_BOOLEAN: {
+			AttributeDefinitionBoolean attributeDefinitionBoolean = (AttributeDefinitionBoolean) theEObject;
+			T result = caseAttributeDefinitionBoolean(attributeDefinitionBoolean);
+			if (result == null)
+				result = caseAttributeDefinitionSimple(attributeDefinitionBoolean);
+			if (result == null)
+				result = caseAttributeDefinition(attributeDefinitionBoolean);
+			if (result == null)
+				result = caseAccessControlledElement(attributeDefinitionBoolean);
+			if (result == null)
+				result = caseIdentifiable(attributeDefinitionBoolean);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_SIMPLE: {
+			AttributeDefinitionSimple attributeDefinitionSimple = (AttributeDefinitionSimple) theEObject;
+			T result = caseAttributeDefinitionSimple(attributeDefinitionSimple);
+			if (result == null)
+				result = caseAttributeDefinition(attributeDefinitionSimple);
+			if (result == null)
+				result = caseAccessControlledElement(attributeDefinitionSimple);
+			if (result == null)
+				result = caseIdentifiable(attributeDefinitionSimple);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.DATATYPE_DEFINITION_BOOLEAN: {
+			DatatypeDefinitionBoolean datatypeDefinitionBoolean = (DatatypeDefinitionBoolean) theEObject;
+			T result = caseDatatypeDefinitionBoolean(datatypeDefinitionBoolean);
+			if (result == null)
+				result = caseDatatypeDefinitionSimple(datatypeDefinitionBoolean);
+			if (result == null)
+				result = caseDatatypeDefinition(datatypeDefinitionBoolean);
+			if (result == null)
+				result = caseIdentifiable(datatypeDefinitionBoolean);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.DATATYPE_DEFINITION_SIMPLE: {
+			DatatypeDefinitionSimple datatypeDefinitionSimple = (DatatypeDefinitionSimple) theEObject;
+			T result = caseDatatypeDefinitionSimple(datatypeDefinitionSimple);
+			if (result == null)
+				result = caseDatatypeDefinition(datatypeDefinitionSimple);
+			if (result == null)
+				result = caseIdentifiable(datatypeDefinitionSimple);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_VALUE_BOOLEAN: {
+			AttributeValueBoolean attributeValueBoolean = (AttributeValueBoolean) theEObject;
+			T result = caseAttributeValueBoolean(attributeValueBoolean);
+			if (result == null)
+				result = caseAttributeValueSimple(attributeValueBoolean);
+			if (result == null)
+				result = caseAttributeValue(attributeValueBoolean);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_VALUE_SIMPLE: {
+			AttributeValueSimple attributeValueSimple = (AttributeValueSimple) theEObject;
+			T result = caseAttributeValueSimple(attributeValueSimple);
+			if (result == null)
+				result = caseAttributeValue(attributeValueSimple);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_DATE: {
+			AttributeDefinitionDate attributeDefinitionDate = (AttributeDefinitionDate) theEObject;
+			T result = caseAttributeDefinitionDate(attributeDefinitionDate);
+			if (result == null)
+				result = caseAttributeDefinitionSimple(attributeDefinitionDate);
+			if (result == null)
+				result = caseAttributeDefinition(attributeDefinitionDate);
+			if (result == null)
+				result = caseAccessControlledElement(attributeDefinitionDate);
+			if (result == null)
+				result = caseIdentifiable(attributeDefinitionDate);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.DATATYPE_DEFINITION_DATE: {
+			DatatypeDefinitionDate datatypeDefinitionDate = (DatatypeDefinitionDate) theEObject;
+			T result = caseDatatypeDefinitionDate(datatypeDefinitionDate);
+			if (result == null)
+				result = caseDatatypeDefinitionSimple(datatypeDefinitionDate);
+			if (result == null)
+				result = caseDatatypeDefinition(datatypeDefinitionDate);
+			if (result == null)
+				result = caseIdentifiable(datatypeDefinitionDate);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_VALUE_DATE: {
+			AttributeValueDate attributeValueDate = (AttributeValueDate) theEObject;
+			T result = caseAttributeValueDate(attributeValueDate);
+			if (result == null)
+				result = caseAttributeValueSimple(attributeValueDate);
+			if (result == null)
+				result = caseAttributeValue(attributeValueDate);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_ENUMERATION: {
+			AttributeDefinitionEnumeration attributeDefinitionEnumeration = (AttributeDefinitionEnumeration) theEObject;
+			T result = caseAttributeDefinitionEnumeration(attributeDefinitionEnumeration);
+			if (result == null)
+				result = caseAttributeDefinition(attributeDefinitionEnumeration);
+			if (result == null)
+				result = caseAccessControlledElement(attributeDefinitionEnumeration);
+			if (result == null)
+				result = caseIdentifiable(attributeDefinitionEnumeration);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.DATATYPE_DEFINITION_ENUMERATION: {
+			DatatypeDefinitionEnumeration datatypeDefinitionEnumeration = (DatatypeDefinitionEnumeration) theEObject;
+			T result = caseDatatypeDefinitionEnumeration(datatypeDefinitionEnumeration);
+			if (result == null)
+				result = caseDatatypeDefinition(datatypeDefinitionEnumeration);
+			if (result == null)
+				result = caseIdentifiable(datatypeDefinitionEnumeration);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ENUM_VALUE: {
+			EnumValue enumValue = (EnumValue) theEObject;
+			T result = caseEnumValue(enumValue);
+			if (result == null)
+				result = caseIdentifiable(enumValue);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.EMBEDDED_VALUE: {
+			EmbeddedValue embeddedValue = (EmbeddedValue) theEObject;
+			T result = caseEmbeddedValue(embeddedValue);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_VALUE_ENUMERATION: {
+			AttributeValueEnumeration attributeValueEnumeration = (AttributeValueEnumeration) theEObject;
+			T result = caseAttributeValueEnumeration(attributeValueEnumeration);
+			if (result == null)
+				result = caseAttributeValue(attributeValueEnumeration);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_INTEGER: {
+			AttributeDefinitionInteger attributeDefinitionInteger = (AttributeDefinitionInteger) theEObject;
+			T result = caseAttributeDefinitionInteger(attributeDefinitionInteger);
+			if (result == null)
+				result = caseAttributeDefinitionSimple(attributeDefinitionInteger);
+			if (result == null)
+				result = caseAttributeDefinition(attributeDefinitionInteger);
+			if (result == null)
+				result = caseAccessControlledElement(attributeDefinitionInteger);
+			if (result == null)
+				result = caseIdentifiable(attributeDefinitionInteger);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.DATATYPE_DEFINITION_INTEGER: {
+			DatatypeDefinitionInteger datatypeDefinitionInteger = (DatatypeDefinitionInteger) theEObject;
+			T result = caseDatatypeDefinitionInteger(datatypeDefinitionInteger);
+			if (result == null)
+				result = caseDatatypeDefinitionSimple(datatypeDefinitionInteger);
+			if (result == null)
+				result = caseDatatypeDefinition(datatypeDefinitionInteger);
+			if (result == null)
+				result = caseIdentifiable(datatypeDefinitionInteger);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_VALUE_INTEGER: {
+			AttributeValueInteger attributeValueInteger = (AttributeValueInteger) theEObject;
+			T result = caseAttributeValueInteger(attributeValueInteger);
+			if (result == null)
+				result = caseAttributeValueSimple(attributeValueInteger);
+			if (result == null)
+				result = caseAttributeValue(attributeValueInteger);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_REAL: {
+			AttributeDefinitionReal attributeDefinitionReal = (AttributeDefinitionReal) theEObject;
+			T result = caseAttributeDefinitionReal(attributeDefinitionReal);
+			if (result == null)
+				result = caseAttributeDefinitionSimple(attributeDefinitionReal);
+			if (result == null)
+				result = caseAttributeDefinition(attributeDefinitionReal);
+			if (result == null)
+				result = caseAccessControlledElement(attributeDefinitionReal);
+			if (result == null)
+				result = caseIdentifiable(attributeDefinitionReal);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.DATATYPE_DEFINITION_REAL: {
+			DatatypeDefinitionReal datatypeDefinitionReal = (DatatypeDefinitionReal) theEObject;
+			T result = caseDatatypeDefinitionReal(datatypeDefinitionReal);
+			if (result == null)
+				result = caseDatatypeDefinitionSimple(datatypeDefinitionReal);
+			if (result == null)
+				result = caseDatatypeDefinition(datatypeDefinitionReal);
+			if (result == null)
+				result = caseIdentifiable(datatypeDefinitionReal);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_VALUE_REAL: {
+			AttributeValueReal attributeValueReal = (AttributeValueReal) theEObject;
+			T result = caseAttributeValueReal(attributeValueReal);
+			if (result == null)
+				result = caseAttributeValueSimple(attributeValueReal);
+			if (result == null)
+				result = caseAttributeValue(attributeValueReal);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_DEFINITION_STRING: {
+			AttributeDefinitionString attributeDefinitionString = (AttributeDefinitionString) theEObject;
+			T result = caseAttributeDefinitionString(attributeDefinitionString);
+			if (result == null)
+				result = caseAttributeDefinitionSimple(attributeDefinitionString);
+			if (result == null)
+				result = caseAttributeDefinition(attributeDefinitionString);
+			if (result == null)
+				result = caseAccessControlledElement(attributeDefinitionString);
+			if (result == null)
+				result = caseIdentifiable(attributeDefinitionString);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.DATATYPE_DEFINITION_STRING: {
+			DatatypeDefinitionString datatypeDefinitionString = (DatatypeDefinitionString) theEObject;
+			T result = caseDatatypeDefinitionString(datatypeDefinitionString);
+			if (result == null)
+				result = caseDatatypeDefinitionSimple(datatypeDefinitionString);
+			if (result == null)
+				result = caseDatatypeDefinition(datatypeDefinitionString);
+			if (result == null)
+				result = caseIdentifiable(datatypeDefinitionString);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.ATTRIBUTE_VALUE_STRING: {
+			AttributeValueString attributeValueString = (AttributeValueString) theEObject;
+			T result = caseAttributeValueString(attributeValueString);
+			if (result == null)
+				result = caseAttributeValueSimple(attributeValueString);
+			if (result == null)
+				result = caseAttributeValue(attributeValueString);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ReqIF10Package.XHTML_CONTENT: {
+			XhtmlContent xhtmlContent = (XhtmlContent) theEObject;
+			T result = caseXhtmlContent(xhtmlContent);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Access Controlled Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Access Controlled Element</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Access Controlled Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -470,12 +645,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Identifiable</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Identifiable</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Identifiable</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -485,12 +659,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value XHTML</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value XHTML</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Value XHTML</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -500,12 +674,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value</em>'. <!-- begin-user-doc
+	 * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -515,12 +689,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Spec Element With Attributes</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Spec Element With Attributes</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Spec Element With Attributes</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -530,12 +704,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition XHTML</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition XHTML</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Definition XHTML</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -545,12 +719,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Definition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -560,12 +734,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Spec Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Spec Type</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Spec Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -575,12 +748,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Req IF Content</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Req IF Content</em>'. <!-- begin-user-doc
+	 * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Req IF Content</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -590,12 +763,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Req IF</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Req IF</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Req IF</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -605,12 +777,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Req IF Header</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Req IF Header</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Req IF Header</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -620,12 +791,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Req IF Tool Extension</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Req IF Tool Extension</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Req IF Tool Extension</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -635,12 +806,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Spec Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Spec Object</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Spec Object</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -650,12 +820,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Spec Object Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Spec Object Type</em>'. <!-- begin-user-doc
+	 * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Spec Object Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -665,12 +835,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Specification</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Specification</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Specification</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -680,12 +849,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Specification Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Specification Type</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Specification Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -695,12 +864,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Spec Hierarchy</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Spec Hierarchy</em>'. <!-- begin-user-doc
+	 * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Spec Hierarchy</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -710,12 +879,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Datatype Definition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -725,12 +894,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Spec Relation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Spec Relation</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Spec Relation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -740,12 +908,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Spec Relation Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Spec Relation Type</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Spec Relation Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -755,12 +923,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Relation Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Relation Group</em>'. <!-- begin-user-doc
+	 * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Relation Group</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -770,12 +938,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Relation Group Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Relation Group Type</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Relation Group Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -785,12 +953,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition XHTML</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition XHTML</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Datatype Definition XHTML</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -800,12 +968,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Alternative ID</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Alternative ID</em>'. <!-- begin-user-doc
+	 * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Alternative ID</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -815,12 +983,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition Boolean</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition Boolean</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Definition Boolean</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -830,12 +998,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition Simple</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition Simple</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Definition Simple</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -845,12 +1013,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition Boolean</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition Boolean</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Datatype Definition Boolean</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -860,12 +1028,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition Simple</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition Simple</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Datatype Definition Simple</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -875,12 +1043,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value Boolean</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value Boolean</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Value Boolean</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -890,12 +1058,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value Simple</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value Simple</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Value Simple</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -905,12 +1073,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition Date</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition Date</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Definition Date</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -920,12 +1088,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition Date</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition Date</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Datatype Definition Date</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -935,12 +1103,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value Date</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value Date</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Value Date</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -950,12 +1118,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition Enumeration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition Enumeration</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Definition Enumeration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -965,12 +1133,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition Enumeration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition Enumeration</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Datatype Definition Enumeration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -980,12 +1148,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Enum Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Enum Value</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Enum Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -995,12 +1162,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Embedded Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Embedded Value</em>'. <!-- begin-user-doc
+	 * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Embedded Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1010,12 +1177,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value Enumeration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value Enumeration</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Value Enumeration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1025,12 +1192,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition Integer</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition Integer</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Definition Integer</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1040,12 +1207,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition Integer</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition Integer</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Datatype Definition Integer</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1055,12 +1222,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value Integer</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value Integer</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Value Integer</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1070,12 +1237,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition Real</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition Real</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Definition Real</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1085,12 +1252,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition Real</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition Real</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Datatype Definition Real</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1100,12 +1267,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value Real</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value Real</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Value Real</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1115,12 +1282,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition String</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Definition String</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Definition String</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1130,12 +1297,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition String</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Datatype Definition String</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Datatype Definition String</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1145,12 +1312,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value String</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value String</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Attribute Value String</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1160,12 +1327,11 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xhtml Content</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>Xhtml Content</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Xhtml Content</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1175,12 +1341,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
+	 * anyway. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -1190,4 +1356,4 @@
 		return null;
 	}
 
-} //ReqIF10Switch
+} // ReqIF10Switch
diff --git a/org.eclipse.rmf.rif11.model.test/META-INF/MANIFEST.MF b/org.eclipse.rmf.rif11.model.test/META-INF/MANIFEST.MF
index 43b3b34..1288af5 100644
--- a/org.eclipse.rmf.rif11.model.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.rif11.model.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.rif11.model.test

-Bundle-Version: 0.9.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Require-Bundle: org.eclipse.core.resources,

  org.eclipse.core.runtime,

  org.eclipse.rmf.rif11.model,

diff --git a/org.eclipse.rmf.rif11.model.test/about.html b/org.eclipse.rmf.rif11.model.test/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.rif11.model.test/about.html
+++ b/org.eclipse.rmf.rif11.model.test/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif11.model.test/build.properties b/org.eclipse.rmf.rif11.model.test/build.properties
index e5b0bda..fd13b64 100644
--- a/org.eclipse.rmf.rif11.model.test/build.properties
+++ b/org.eclipse.rmf.rif11.model.test/build.properties
@@ -1,3 +1,4 @@
+###############################################################################

 # Copyright (c) 2011 itemis GmbH.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

@@ -6,7 +7,11 @@
 #

 # Contributors:

 #     Nirmal Sasidharan - initial API and implementation

+###############################################################################

 source.. = src/

 bin.includes = META-INF/,\

                .,\

-               plugin.properties

+               plugin.properties,\

+               epl-v10.html,\

+               notice.html,\

+               about.html

diff --git a/org.eclipse.rmf.rif11.model.test/epl-v10.html b/org.eclipse.rmf.rif11.model.test/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.rif11.model.test/epl-v10.html
+++ b/org.eclipse.rmf.rif11.model.test/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif11.model.test/notice.html b/org.eclipse.rmf.rif11.model.test/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.rif11.model.test/notice.html
+++ b/org.eclipse.rmf.rif11.model.test/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.rif11.model.test/plugin.properties b/org.eclipse.rmf.rif11.model.test/plugin.properties
index 7b5b897..ee0f792 100644
--- a/org.eclipse.rmf.rif11.model.test/plugin.properties
+++ b/org.eclipse.rmf.rif11.model.test/plugin.properties
@@ -1,3 +1,4 @@
+###############################################################################

 # Copyright (c) 2011 itemis GmbH.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

@@ -6,5 +7,6 @@
 #

 # Contributors:

 #     Nirmal Sasidharan - initial API and implementation

+###############################################################################

 pluginName = Rif11a Model Tests (Incubation)

 providerName = Eclipse Modeling Project

diff --git a/org.eclipse.rmf.rif11.model.test/pom.xml b/org.eclipse.rmf.rif11.model.test/pom.xml
index 6fbbe7b..6f276aa 100644
--- a/org.eclipse.rmf.rif11.model.test/pom.xml
+++ b/org.eclipse.rmf.rif11.model.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<groupId>org.eclipse.rmf.plugins</groupId>

 	<artifactId>org.eclipse.rmf.rif11.model.test</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

+	<version>0.10.0-SNAPSHOT</version>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

@@ -46,7 +46,7 @@
 			<plugin>

 				<groupId>org.eclipse.tycho</groupId>

 				<artifactId>tycho-surefire-plugin</artifactId>

-				<version>${tycho-version}</version>

+				<version>${tycho.version}</version>

 				<configuration>

 					<includes>

 						<include>**/All*Tests.class</include>

diff --git a/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/AllTests.java b/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/AllTests.java
index f107514..5f4acc7 100644
--- a/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/AllTests.java
+++ b/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/AllTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************

+ * Copyright (c) 2014 itemis AG and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     Mark Broerkens (itemis AG) - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.rmf.rif11.model.test;

 

 import org.junit.runner.RunWith;

diff --git a/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/RIF72Test.java b/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/RIF72Test.java
index 2276f73..b9e14ac 100644
--- a/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/RIF72Test.java
+++ b/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/RIF72Test.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/Rif11ResourceTest.java b/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/Rif11ResourceTest.java
index f3c25e5..3a0341b 100644
--- a/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/Rif11ResourceTest.java
+++ b/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/Rif11ResourceTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/Rif11ResourceTestBase.java b/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/Rif11ResourceTestBase.java
index b43a4a7..e940de5 100644
--- a/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/Rif11ResourceTestBase.java
+++ b/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/Rif11ResourceTestBase.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/Rif62Test.java b/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/Rif62Test.java
index df86215..9811f73 100644
--- a/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/Rif62Test.java
+++ b/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/Rif62Test.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/META-INF/MANIFEST.MF b/org.eclipse.rmf.rif11.model/META-INF/MANIFEST.MF
index fb95c2e..1e2c7fb 100644
--- a/org.eclipse.rmf.rif11.model/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.rif11.model/META-INF/MANIFEST.MF
@@ -2,19 +2,16 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.rif11.model;singleton:=true

-Bundle-Version: 0.9.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Export-Package: org.eclipse.rmf.rif11.DataTypes,

- org.eclipse.rmf.rif11.DataTypes.impl,

- org.eclipse.rmf.rif11.DataTypes.util,

- org.eclipse.rmf.rif11.EA_AUTOSARM2_Types_Package,

- org.eclipse.rmf.rif11.EA_AUTOSARM2_Types_Package.impl,

- org.eclipse.rmf.rif11.ExchangeFile,

- org.eclipse.rmf.rif11.ExchangeFile.impl,

- org.eclipse.rmf.rif11.ExchangeFile.util

+Export-Package: org.eclipse.rmf.rif11.DataTypes,org.eclipse.rmf.rif11.

+ DataTypes.impl,org.eclipse.rmf.rif11.DataTypes.util,org.eclipse.rmf.r

+ if11.EA_AUTOSARM2_Types_Package,org.eclipse.rmf.rif11.EA_AUTOSARM2_Ty

+ pes_Package.impl,org.eclipse.rmf.rif11.ExchangeFile,org.eclipse.rmf.r

+ if11.ExchangeFile.impl,org.eclipse.rmf.rif11.ExchangeFile.util

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport

diff --git a/org.eclipse.rmf.rif11.model/about.html b/org.eclipse.rmf.rif11.model/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.rif11.model/about.html
+++ b/org.eclipse.rmf.rif11.model/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif11.model/build.properties b/org.eclipse.rmf.rif11.model/build.properties
index 79070dd..578c7f1 100644
--- a/org.eclipse.rmf.rif11.model/build.properties
+++ b/org.eclipse.rmf.rif11.model/build.properties
@@ -1,3 +1,4 @@
+###############################################################################

 # Copyright (c) 2011 itemis GmbH.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

@@ -6,11 +7,15 @@
 #

 # Contributors:

 #     Nirmal Sasidharan - initial API and implementation

+###############################################################################

 bin.includes = .,\

                model/,\

                META-INF/,\

                plugin.xml,\

-               plugin.properties

+               plugin.properties,\

+               epl-v10.html,\

+               about.html,\

+               notice.html

 jars.compile.order = .

 source.. = src/

 output.. = bin/

diff --git a/org.eclipse.rmf.rif11.model/epl-v10.html b/org.eclipse.rmf.rif11.model/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.rif11.model/epl-v10.html
+++ b/org.eclipse.rmf.rif11.model/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif11.model/notice.html b/org.eclipse.rmf.rif11.model/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.rif11.model/notice.html
+++ b/org.eclipse.rmf.rif11.model/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.rif11.model/plugin.properties b/org.eclipse.rmf.rif11.model/plugin.properties
index c650aed..48de7b2 100644
--- a/org.eclipse.rmf.rif11.model/plugin.properties
+++ b/org.eclipse.rmf.rif11.model/plugin.properties
@@ -1,3 +1,4 @@
+###############################################################################

 # Copyright (c) 2011 itemis GmbH.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

@@ -6,5 +7,6 @@
 #

 # Contributors:

 #     Nirmal Sasidharan - initial API and implementation

+###############################################################################

 pluginName = Rif11a Model (Incubation)

 providerName = Eclipse Modeling Project

diff --git a/org.eclipse.rmf.rif11.model/pom.xml b/org.eclipse.rmf.rif11.model/pom.xml
index 0761388..0038e80 100644
--- a/org.eclipse.rmf.rif11.model/pom.xml
+++ b/org.eclipse.rmf.rif11.model/pom.xml
@@ -6,31 +6,13 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.rif11.model</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

 	<packaging>eclipse-plugin</packaging>

 	<groupId>org.eclipse.rmf.plugins</groupId>

- 	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.eclipse.tycho</groupId>

-				<artifactId>tycho-source-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<executions>

-					<execution>

-						<id>plugin-source</id>

-						<goals>

-							<goal>plugin-source</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/BinaryContent.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/BinaryContent.java
index 59c77d3..c82da58 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/BinaryContent.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/BinaryContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/DataTypesFactory.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/DataTypesFactory.java
index 8e8b262..89f3705 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/DataTypesFactory.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/DataTypesFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/DataTypesPackage.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/DataTypesPackage.java
index 85d608f..aea017b 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/DataTypesPackage.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/DataTypesPackage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/XhtmlContent.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/XhtmlContent.java
index 6d4d0df..4e5a07b 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/XhtmlContent.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/XhtmlContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/XmlContent.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/XmlContent.java
index 62c3ad6..a63ef6b 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/XmlContent.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/XmlContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/BinaryContentImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/BinaryContentImpl.java
index df11022..e5ba978 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/BinaryContentImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/BinaryContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/DataTypesFactoryImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/DataTypesFactoryImpl.java
index 7957d7d..663dcdd 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/DataTypesFactoryImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/DataTypesFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/DataTypesPackageImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/DataTypesPackageImpl.java
index 0b0b0fe..3f46c23 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/DataTypesPackageImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/DataTypesPackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/XhtmlContentImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/XhtmlContentImpl.java
index 82acbf4..8314555 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/XhtmlContentImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/XhtmlContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/XmlContentImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/XmlContentImpl.java
index 0985ef2..19728e1 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/XmlContentImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/impl/XmlContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/util/DataTypesAdapterFactory.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/util/DataTypesAdapterFactory.java
index 01610f4..3f2572b 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/util/DataTypesAdapterFactory.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/util/DataTypesAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/util/DataTypesSwitch.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/util/DataTypesSwitch.java
index 6aa4f7a..f7fb5f1 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/util/DataTypesSwitch.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/util/DataTypesSwitch.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/validation/BinaryContentValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/validation/BinaryContentValidator.java
index 24799c3..f633efb 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/validation/BinaryContentValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/validation/BinaryContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/validation/XhtmlContentValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/validation/XhtmlContentValidator.java
index 20e29e7..c646273 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/validation/XhtmlContentValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/validation/XhtmlContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/validation/XmlContentValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/validation/XmlContentValidator.java
index 22fff6a..8c5b6bc 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/validation/XmlContentValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/DataTypes/validation/XmlContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/AccessPolicyAccessModeEnum.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/AccessPolicyAccessModeEnum.java
index fe1638e..c832c06 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/AccessPolicyAccessModeEnum.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/AccessPolicyAccessModeEnum.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/DatatypeDefinitionDateFormatEnum.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/DatatypeDefinitionDateFormatEnum.java
index fcb2eb3..255af41 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/DatatypeDefinitionDateFormatEnum.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/DatatypeDefinitionDateFormatEnum.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/EA_AUTOSARM2_Types_PackageFactory.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/EA_AUTOSARM2_Types_PackageFactory.java
index a4b48ad..0241726 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/EA_AUTOSARM2_Types_PackageFactory.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/EA_AUTOSARM2_Types_PackageFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/EA_AUTOSARM2_Types_PackagePackage.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/EA_AUTOSARM2_Types_PackagePackage.java
index 934e402..3ee177f 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/EA_AUTOSARM2_Types_PackagePackage.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/EA_AUTOSARM2_Types_PackagePackage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/impl/EA_AUTOSARM2_Types_PackageFactoryImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/impl/EA_AUTOSARM2_Types_PackageFactoryImpl.java
index 7a1d32a..4c4db5b 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/impl/EA_AUTOSARM2_Types_PackageFactoryImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/impl/EA_AUTOSARM2_Types_PackageFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/impl/EA_AUTOSARM2_Types_PackagePackageImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/impl/EA_AUTOSARM2_Types_PackagePackageImpl.java
index 8779629..ab2a292 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/impl/EA_AUTOSARM2_Types_PackagePackageImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/EA_AUTOSARM2_Types_Package/impl/EA_AUTOSARM2_Types_PackagePackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AccessPolicy.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AccessPolicy.java
index 6c5b413..5d52271 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AccessPolicy.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AccessPolicy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeDefinition.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeDefinition.java
index a6c5f3e..0b5e75e 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeDefinition.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeDefinition.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeDefinitionComplex.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeDefinitionComplex.java
index c2595ca..319b3ce 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeDefinitionComplex.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeDefinitionComplex.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeDefinitionEnumeration.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeDefinitionEnumeration.java
index 2d9d521..13339c3 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeDefinitionEnumeration.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeDefinitionEnumeration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeDefinitionSimple.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeDefinitionSimple.java
index 35ce383..6551439 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeDefinitionSimple.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeDefinitionSimple.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueComplex.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueComplex.java
index f6c605d..bc4075a 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueComplex.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueComplex.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueEmbeddedDocument.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueEmbeddedDocument.java
index 68baaa4..e01b1d1 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueEmbeddedDocument.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueEmbeddedDocument.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueEmbeddedFile.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueEmbeddedFile.java
index 1e8df57..cae3cff 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueEmbeddedFile.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueEmbeddedFile.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueEnumeration.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueEnumeration.java
index 07da177..dc920ea 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueEnumeration.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueEnumeration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueFileReference.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueFileReference.java
index 00e54e7..a55879b 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueFileReference.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueFileReference.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueSimple.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueSimple.java
index 70e85a5..0dbde83 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueSimple.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueSimple.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueXmlData.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueXmlData.java
index 820019e..137889f 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueXmlData.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/AttributeValueXmlData.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinition.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinition.java
index 07f5e52..c0e3862 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinition.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinition.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionBinaryFile.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionBinaryFile.java
index 5b0cfb8..02897aa 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionBinaryFile.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionBinaryFile.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionBoolean.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionBoolean.java
index 357e231..6948d79 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionBoolean.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionBoolean.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionComplex.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionComplex.java
index 4be8f65..3624b41 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionComplex.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionComplex.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionDate.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionDate.java
index 15f2da2..ce86832 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionDate.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionDate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionDocument.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionDocument.java
index 24e838e..7ca3117 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionDocument.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionDocument.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionEnumeration.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionEnumeration.java
index 9e09a73..8a7ac43 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionEnumeration.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionEnumeration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionInteger.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionInteger.java
index 4cfa4e1..15fdb7c 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionInteger.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionInteger.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionReal.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionReal.java
index ee92e29..ecff9e5 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionReal.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionReal.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionSimple.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionSimple.java
index 0320e84..4d3f639 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionSimple.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionSimple.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionString.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionString.java
index 2f15340..e3b8acc 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionString.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionString.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionXmlData.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionXmlData.java
index 2ffdd5c..0a7c939 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionXmlData.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/DatatypeDefinitionXmlData.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/EmbeddedValue.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/EmbeddedValue.java
index e8bb26d..053b723 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/EmbeddedValue.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/EmbeddedValue.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/EnumValue.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/EnumValue.java
index d39b157..09512df 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/EnumValue.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/EnumValue.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/ExchangeFileFactory.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/ExchangeFileFactory.java
index c88d283..a51e2dc 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/ExchangeFileFactory.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/ExchangeFileFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/ExchangeFilePackage.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/ExchangeFilePackage.java
index 5792335..e9e4c57 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/ExchangeFilePackage.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/ExchangeFilePackage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/Identifiable.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/Identifiable.java
index db8d6c5..00d1bc4 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/Identifiable.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/Identifiable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/RIF.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/RIF.java
index 7e83303..d8e9598 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/RIF.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/RIF.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/SpecElementWithUserDefinedAttributes.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/SpecElementWithUserDefinedAttributes.java
index a195f7c..fc8d5a1 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/SpecElementWithUserDefinedAttributes.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/SpecElementWithUserDefinedAttributes.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AccessPolicyImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AccessPolicyImpl.java
index 81fa4e4..d4a037f 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AccessPolicyImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AccessPolicyImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeDefinitionComplexImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeDefinitionComplexImpl.java
index a310cf8..0f893ef 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeDefinitionComplexImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeDefinitionComplexImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeDefinitionEnumerationImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeDefinitionEnumerationImpl.java
index 389ecb9..5b4f894 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeDefinitionEnumerationImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeDefinitionEnumerationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeDefinitionImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeDefinitionImpl.java
index 0d30b83..fb0d41e 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeDefinitionImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeDefinitionImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeDefinitionSimpleImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeDefinitionSimpleImpl.java
index 5698937..7bee51f 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeDefinitionSimpleImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeDefinitionSimpleImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueComplexImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueComplexImpl.java
index 4a01911..ccb2882 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueComplexImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueComplexImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueEmbeddedDocumentImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueEmbeddedDocumentImpl.java
index 722c447..68fc87e 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueEmbeddedDocumentImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueEmbeddedDocumentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueEmbeddedFileImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueEmbeddedFileImpl.java
index 62fffa7..c74e1b9 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueEmbeddedFileImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueEmbeddedFileImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueEnumerationImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueEnumerationImpl.java
index c91114f..d804b47 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueEnumerationImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueEnumerationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueFileReferenceImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueFileReferenceImpl.java
index 57eafbc..a7c8595 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueFileReferenceImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueFileReferenceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueImpl.java
index 60d32ea..8810cae 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueSimpleImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueSimpleImpl.java
index 4ccf1de..acf1a83 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueSimpleImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueSimpleImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueXmlDataImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueXmlDataImpl.java
index 1f131a6..8884eff 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueXmlDataImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/AttributeValueXmlDataImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionBinaryFileImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionBinaryFileImpl.java
index 34d7f8a..9c66216 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionBinaryFileImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionBinaryFileImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionBooleanImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionBooleanImpl.java
index 43d4f06..a1cd32a 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionBooleanImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionBooleanImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionComplexImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionComplexImpl.java
index 4691fcc..47c954f 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionComplexImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionComplexImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionDateImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionDateImpl.java
index 66b40b7..90f13a8 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionDateImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionDateImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionDocumentImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionDocumentImpl.java
index 4dc4bb3..246bb89 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionDocumentImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionDocumentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionEnumerationImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionEnumerationImpl.java
index 70b963f..4f331c2 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionEnumerationImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionEnumerationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionImpl.java
index ebccfa4..1747553 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionIntegerImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionIntegerImpl.java
index 07ee16f..3c32f6a 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionIntegerImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionIntegerImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionRealImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionRealImpl.java
index 15ee15e..dab7801 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionRealImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionRealImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionSimpleImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionSimpleImpl.java
index 2625bbf..0697266 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionSimpleImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionSimpleImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionStringImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionStringImpl.java
index 07f5a3a..5f16a79 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionStringImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionStringImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionXmlDataImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionXmlDataImpl.java
index 5640c86..c554637 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionXmlDataImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/DatatypeDefinitionXmlDataImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/EmbeddedValueImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/EmbeddedValueImpl.java
index de0baa7..1f8abbb 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/EmbeddedValueImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/EmbeddedValueImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/EnumValueImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/EnumValueImpl.java
index f69437f..c39d643 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/EnumValueImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/EnumValueImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/ExchangeFileFactoryImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/ExchangeFileFactoryImpl.java
index 9f68966..a2746d5 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/ExchangeFileFactoryImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/ExchangeFileFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/ExchangeFilePackageImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/ExchangeFilePackageImpl.java
index fc9db70..e89ad3b 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/ExchangeFilePackageImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/ExchangeFilePackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/IdentifiableImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/IdentifiableImpl.java
index 89083c1..b3087c3 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/IdentifiableImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/IdentifiableImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/RIFImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/RIFImpl.java
index 637d048..4044a01 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/RIFImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/RIFImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/RelationGroupImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/RelationGroupImpl.java
index 694122b..5f1f952 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/RelationGroupImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/RelationGroupImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecElementWithUserDefinedAttributesImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecElementWithUserDefinedAttributesImpl.java
index 318ce3c..d8da66c 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecElementWithUserDefinedAttributesImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecElementWithUserDefinedAttributesImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecGroupImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecGroupImpl.java
index 3b0b60a..d46f146 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecGroupImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecGroupImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecHierarchyImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecHierarchyImpl.java
index e3cbb4a..c96ba8a 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecHierarchyImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecHierarchyImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecHierarchyRootImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecHierarchyRootImpl.java
index dc967cb..e3e4320 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecHierarchyRootImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecHierarchyRootImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecObjectImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecObjectImpl.java
index 6823785..aa954b3 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecObjectImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecObjectImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecRelationImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecRelationImpl.java
index 4adb19b..27965e3 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecRelationImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecRelationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecTypeImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecTypeImpl.java
index 2758930..6739a4c 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecTypeImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/impl/SpecTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileAdapterFactory.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileAdapterFactory.java
index ae8b3b0..1dc019a 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileAdapterFactory.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileResourceFactoryImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileResourceFactoryImpl.java
index 436816b..f6ca50d 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileResourceFactoryImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileResourceImpl.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileResourceImpl.java
index 32cb788..850997a 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileResourceImpl.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileResourceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileSwitch.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileSwitch.java
index 766b1c0..3f8d4d1 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileSwitch.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileSwitch.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileXMLProcessor.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileXMLProcessor.java
index cd38935..1cb6c15 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileXMLProcessor.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/util/ExchangeFileXMLProcessor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AccessPolicyValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AccessPolicyValidator.java
index 3cb5be0..ab4a912 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AccessPolicyValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AccessPolicyValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeDefinitionComplexValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeDefinitionComplexValidator.java
index 1a1f5a2..549481b 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeDefinitionComplexValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeDefinitionComplexValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeDefinitionEnumerationValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeDefinitionEnumerationValidator.java
index cf9c0da..60eb62f 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeDefinitionEnumerationValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeDefinitionEnumerationValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeDefinitionSimpleValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeDefinitionSimpleValidator.java
index 30237a2..9855d74 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeDefinitionSimpleValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeDefinitionSimpleValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeDefinitionValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeDefinitionValidator.java
index 5d60e9f..ac2ecee 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeDefinitionValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeDefinitionValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueComplexValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueComplexValidator.java
index b7cda19..9236247 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueComplexValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueComplexValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueEmbeddedDocumentValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueEmbeddedDocumentValidator.java
index d07b199..6906170 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueEmbeddedDocumentValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueEmbeddedDocumentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueEmbeddedFileValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueEmbeddedFileValidator.java
index a08bdd1..04cf0a6 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueEmbeddedFileValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueEmbeddedFileValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueEnumerationValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueEnumerationValidator.java
index 51c4109..8e14ced 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueEnumerationValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueEnumerationValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueFileReferenceValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueFileReferenceValidator.java
index 3c3f224..985f500 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueFileReferenceValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueFileReferenceValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueSimpleValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueSimpleValidator.java
index 34c67f8..909bf55 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueSimpleValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueSimpleValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueValidator.java
index fdb7f39..9caf168 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueXmlDataValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueXmlDataValidator.java
index de77877..d3bfc3d 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueXmlDataValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/AttributeValueXmlDataValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionBinaryFileValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionBinaryFileValidator.java
index 3cc4cfa..742ebbb 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionBinaryFileValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionBinaryFileValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionBooleanValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionBooleanValidator.java
index 2778ff8..8debbcf 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionBooleanValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionBooleanValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionComplexValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionComplexValidator.java
index 067025b..6ef4757 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionComplexValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionComplexValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionDateValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionDateValidator.java
index 0d8f0a8..d9bef63 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionDateValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionDateValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionDocumentValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionDocumentValidator.java
index 9254ed5..8cd2eb8 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionDocumentValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionDocumentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionEnumerationValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionEnumerationValidator.java
index 178d3bb..a754483 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionEnumerationValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionEnumerationValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionIntegerValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionIntegerValidator.java
index 31a18e6..8460bb6 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionIntegerValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionIntegerValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionRealValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionRealValidator.java
index 7a01472..c69ef18 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionRealValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionRealValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionSimpleValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionSimpleValidator.java
index 84c2f71..2d35bb4 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionSimpleValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionSimpleValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionStringValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionStringValidator.java
index a1f8dc5..cf0b9e3 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionStringValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionStringValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionValidator.java
index 0ca2305..0ccc6d7 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionXmlDataValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionXmlDataValidator.java
index 27f0376..c4108fd 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionXmlDataValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/DatatypeDefinitionXmlDataValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/EmbeddedValueValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/EmbeddedValueValidator.java
index e7b7619..ca933a9 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/EmbeddedValueValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/EmbeddedValueValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/EnumValueValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/EnumValueValidator.java
index 9eb5abb..2060985 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/EnumValueValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/EnumValueValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/IdentifiableValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/IdentifiableValidator.java
index 25421a4..5146ab1 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/IdentifiableValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/IdentifiableValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/RIFValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/RIFValidator.java
index 30c15e9..d7d1ffe 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/RIFValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/RIFValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/RelationGroupValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/RelationGroupValidator.java
index e880441..fa0add4 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/RelationGroupValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/RelationGroupValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecElementWithUserDefinedAttributesValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecElementWithUserDefinedAttributesValidator.java
index 76ad6c3..68e7067 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecElementWithUserDefinedAttributesValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecElementWithUserDefinedAttributesValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecGroupValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecGroupValidator.java
index 02f2741..edf10e1 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecGroupValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecGroupValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecHierarchyRootValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecHierarchyRootValidator.java
index df97de2..880a5da 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecHierarchyRootValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecHierarchyRootValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecHierarchyValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecHierarchyValidator.java
index e271234..496db1b 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecHierarchyValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecHierarchyValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecObjectValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecObjectValidator.java
index bf62fbe..82f0d97 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecObjectValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecObjectValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecRelationValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecRelationValidator.java
index 2515ab0..804b581 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecRelationValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecRelationValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecTypeValidator.java b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecTypeValidator.java
index 8e16fe0..e28a2e6 100644
--- a/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecTypeValidator.java
+++ b/org.eclipse.rmf.rif11.model/src/org/eclipse/rmf/rif11/ExchangeFile/validation/SpecTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.resource/META-INF/MANIFEST.MF b/org.eclipse.rmf.rif11.resource/META-INF/MANIFEST.MF
index 04cccd8..cfdbc7b 100644
--- a/org.eclipse.rmf.rif11.resource/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.rif11.resource/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.rif11.resource;singleton:=true

-Bundle-Version: 0.9.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.6.1",

  org.eclipse.rmf.rif11.model;bundle-version="0.1.0",

diff --git a/org.eclipse.rmf.rif11.resource/about.html b/org.eclipse.rmf.rif11.resource/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.rif11.resource/about.html
+++ b/org.eclipse.rmf.rif11.resource/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif11.resource/build.properties b/org.eclipse.rmf.rif11.resource/build.properties
index 72c85b8..246f6f6 100644
--- a/org.eclipse.rmf.rif11.resource/build.properties
+++ b/org.eclipse.rmf.rif11.resource/build.properties
@@ -1,3 +1,4 @@
+###############################################################################

 # Copyright (c) 2011 itemis GmbH.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

@@ -6,9 +7,13 @@
 #

 # Contributors:

 #     Nirmal Sasidharan - initial API and implementation

+###############################################################################

 source.. = src/

 output.. = bin/

 bin.includes = META-INF/,\

                .,\

                plugin.xml,\

-               plugin.properties

+               plugin.properties,\

+               about.html,\

+               epl-v10.html,\

+               notice.html

diff --git a/org.eclipse.rmf.rif11.resource/epl-v10.html b/org.eclipse.rmf.rif11.resource/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.rif11.resource/epl-v10.html
+++ b/org.eclipse.rmf.rif11.resource/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif11.resource/notice.html b/org.eclipse.rmf.rif11.resource/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.rif11.resource/notice.html
+++ b/org.eclipse.rmf.rif11.resource/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.rif11.resource/plugin.properties b/org.eclipse.rmf.rif11.resource/plugin.properties
index 126a512..a7f43b6 100644
--- a/org.eclipse.rmf.rif11.resource/plugin.properties
+++ b/org.eclipse.rmf.rif11.resource/plugin.properties
@@ -1,3 +1,4 @@
+###############################################################################

 # Copyright (c) 2011 itemis GmbH.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

@@ -6,5 +7,6 @@
 #

 # Contributors:

 #     Nirmal Sasidharan - initial API and implementation

+###############################################################################

 pluginName = Rif11a Resource (Incubation)

 providerName = Eclipse Modeling Project

diff --git a/org.eclipse.rmf.rif11.resource/pom.xml b/org.eclipse.rmf.rif11.resource/pom.xml
index aa56dd9..b5a2db6 100644
--- a/org.eclipse.rmf.rif11.resource/pom.xml
+++ b/org.eclipse.rmf.rif11.resource/pom.xml
@@ -6,31 +6,13 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.rif11.resource</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

 	<packaging>eclipse-plugin</packaging>

 	<groupId>org.eclipse.rmf.plugins</groupId>

- 	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.eclipse.tycho</groupId>

-				<artifactId>tycho-source-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<executions>

-					<execution>

-						<id>plugin-source</id>

-						<goals>

-							<goal>plugin-source</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/Rif11ResourceFactoryImpl.java b/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/Rif11ResourceFactoryImpl.java
index e0894a9..92bb178 100644
--- a/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/Rif11ResourceFactoryImpl.java
+++ b/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/Rif11ResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/Rif11ResourceImpl.java b/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/Rif11ResourceImpl.java
index 7ac1a1e..45188a7 100644
--- a/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/Rif11ResourceImpl.java
+++ b/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/Rif11ResourceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/Rif2XMLConverter.java b/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/Rif2XMLConverter.java
index 5130378..3914ea9 100644
--- a/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/Rif2XMLConverter.java
+++ b/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/Rif2XMLConverter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/XML2RifConverter.java b/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/XML2RifConverter.java
index ebd2121..3d97652 100644
--- a/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/XML2RifConverter.java
+++ b/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/XML2RifConverter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/XhtmlContentAny.java b/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/XhtmlContentAny.java
index b9e295a..d1f5be6 100644
--- a/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/XhtmlContentAny.java
+++ b/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/XhtmlContentAny.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/XhtmlContentAnyImpl.java b/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/XhtmlContentAnyImpl.java
index 651f6b4..4d8959e 100644
--- a/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/XhtmlContentAnyImpl.java
+++ b/org.eclipse.rmf.rif11.resource/src/org/eclipse/rmf/rif11/resource/XhtmlContentAnyImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/META-INF/MANIFEST.MF b/org.eclipse.rmf.rif11.xsd.model/META-INF/MANIFEST.MF
index 4067b5a..279a156 100644
--- a/org.eclipse.rmf.rif11.xsd.model/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.rif11.xsd.model/META-INF/MANIFEST.MF
@@ -2,17 +2,14 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.rif11.xsd.model;singleton:=true

-Bundle-Version: 0.9.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Export-Package: org.eclipse.rmf.rif11.xhtml,

- org.eclipse.rmf.rif11.xhtml.impl,

- org.eclipse.rmf.rif11.xhtml.util,

- org.eclipse.rmf.rif11.xsd,

- org.eclipse.rmf.rif11.xsd.impl,

- org.eclipse.rmf.rif11.xsd.util

+Export-Package: org.eclipse.rmf.rif11.xhtml,org.eclipse.rmf.rif11.xhtm

+ l.impl,org.eclipse.rmf.rif11.xhtml.util,org.eclipse.rmf.rif11.xsd,org

+ .eclipse.rmf.rif11.xsd.impl,org.eclipse.rmf.rif11.xsd.util

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport

diff --git a/org.eclipse.rmf.rif11.xsd.model/about.html b/org.eclipse.rmf.rif11.xsd.model/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.rif11.xsd.model/about.html
+++ b/org.eclipse.rmf.rif11.xsd.model/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif11.xsd.model/build.properties b/org.eclipse.rmf.rif11.xsd.model/build.properties
index 79070dd..6083971 100644
--- a/org.eclipse.rmf.rif11.xsd.model/build.properties
+++ b/org.eclipse.rmf.rif11.xsd.model/build.properties
@@ -1,3 +1,4 @@
+###############################################################################

 # Copyright (c) 2011 itemis GmbH.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

@@ -6,11 +7,15 @@
 #

 # Contributors:

 #     Nirmal Sasidharan - initial API and implementation

+###############################################################################

 bin.includes = .,\

                model/,\

                META-INF/,\

                plugin.xml,\

-               plugin.properties

+               plugin.properties,\

+               epl-v10.html,\

+               notice.html,\

+               about.html

 jars.compile.order = .

 source.. = src/

 output.. = bin/

diff --git a/org.eclipse.rmf.rif11.xsd.model/epl-v10.html b/org.eclipse.rmf.rif11.xsd.model/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.rif11.xsd.model/epl-v10.html
+++ b/org.eclipse.rmf.rif11.xsd.model/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif11.xsd.model/notice.html b/org.eclipse.rmf.rif11.xsd.model/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.rif11.xsd.model/notice.html
+++ b/org.eclipse.rmf.rif11.xsd.model/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.rif11.xsd.model/plugin.properties b/org.eclipse.rmf.rif11.xsd.model/plugin.properties
index a618a38..0a83e71 100644
--- a/org.eclipse.rmf.rif11.xsd.model/plugin.properties
+++ b/org.eclipse.rmf.rif11.xsd.model/plugin.properties
@@ -1,3 +1,4 @@
+###############################################################################

 # Copyright (c) 2011 itemis GmbH.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

@@ -6,5 +7,6 @@
 #

 # Contributors:

 #     Nirmal Sasidharan - initial API and implementation

+###############################################################################

 pluginName = Rif11a XSD Model (Incubation)

 providerName = Eclipse Modeling Project

diff --git a/org.eclipse.rmf.rif11.xsd.model/pom.xml b/org.eclipse.rmf.rif11.xsd.model/pom.xml
index e4948e8..47eb3f6 100644
--- a/org.eclipse.rmf.rif11.xsd.model/pom.xml
+++ b/org.eclipse.rmf.rif11.xsd.model/pom.xml
@@ -6,31 +6,13 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.rif11.xsd.model</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

 	<packaging>eclipse-plugin</packaging>

 	<groupId>org.eclipse.rmf.plugins</groupId>

- 	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.eclipse.tycho</groupId>

-				<artifactId>tycho-source-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<executions>

-					<execution>

-						<id>plugin-source</id>

-						<goals>

-							<goal>plugin-source</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AContent.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AContent.java
index 0922645..51c2996 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AContent.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AType.java
index 4ac7a0e..ea39727 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AbbrType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AbbrType.java
index 1da0c48..806c807 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AbbrType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AbbrType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AcronymType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AcronymType.java
index 4a19cfd..36b74cc 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AcronymType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AcronymType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AddressType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AddressType.java
index b70fffe..c90860c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AddressType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AddressType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AlignType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AlignType.java
index 255692a..316290c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AlignType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/AlignType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BType.java
index d685fa5..1b2a26d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BigType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BigType.java
index bbf02af..ff1438c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BigType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BigType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Block.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Block.java
index b6e8670..25da109 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Block.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Block.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BlockquoteType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BlockquoteType.java
index a9f37df..3bdcddb 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BlockquoteType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BlockquoteType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BodyType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BodyType.java
index 08186fa..f0e3522 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BodyType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BodyType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BrType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BrType.java
index f0e0035..e318d87 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BrType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/BrType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/CaptionType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/CaptionType.java
index 4b21a9d..db8ae75 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/CaptionType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/CaptionType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/CiteType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/CiteType.java
index c4ff622..4530412 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/CiteType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/CiteType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/CodeType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/CodeType.java
index 3052256..d153d64 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/CodeType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/CodeType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ColType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ColType.java
index 4888eaf..d06a855 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ColType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ColType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ColgroupType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ColgroupType.java
index 890887b..6fc4193 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ColgroupType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ColgroupType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DdType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DdType.java
index 208f2ac..eb40530 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DdType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DdType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DeclareType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DeclareType.java
index 214a5db..df078a7 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DeclareType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DeclareType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DelType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DelType.java
index c523555..f3cd357 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DelType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DelType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DfnType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DfnType.java
index 97199b6..aa63206 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DfnType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DfnType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DivType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DivType.java
index 992aa52..a215565 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DivType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DivType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DlType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DlType.java
index a23ff36..dbc6063 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DlType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DlType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DocumentRoot.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DocumentRoot.java
index fc59cce..75f04d0 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DocumentRoot.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DocumentRoot.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DtType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DtType.java
index bd88422..ba99af0 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DtType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/DtType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/EmType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/EmType.java
index 7ed5138..962f6e4 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/EmType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/EmType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Flow.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Flow.java
index 773c727..39373b5 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Flow.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Flow.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/FormContent.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/FormContent.java
index 387287b..bab5054 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/FormContent.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/FormContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H1Type.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H1Type.java
index 2f47599..5e3243b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H1Type.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H1Type.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H2Type.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H2Type.java
index 1bc9619..2ce154a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H2Type.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H2Type.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H3Type.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H3Type.java
index f904f1e..353ff44 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H3Type.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H3Type.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H4Type.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H4Type.java
index bb259f6..e21cf8c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H4Type.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H4Type.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H5Type.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H5Type.java
index dbd4bda..2c8aefb 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H5Type.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H5Type.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H6Type.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H6Type.java
index 3aba154..23ab8c3 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H6Type.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/H6Type.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/HrType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/HrType.java
index 351fd7a..c2c4102 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/HrType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/HrType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/HtmlType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/HtmlType.java
index af40922..809e220 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/HtmlType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/HtmlType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/IType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/IType.java
index 256600e..7aa9c4e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/IType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/IType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ImgType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ImgType.java
index 1230d6d..25d4b18 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ImgType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ImgType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Inline.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Inline.java
index 1dd02ed..fca0efe 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Inline.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Inline.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/InsType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/InsType.java
index 148617b..89b14b9 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/InsType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/InsType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/IsmapType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/IsmapType.java
index accf686..19b395d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/IsmapType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/IsmapType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/KbdType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/KbdType.java
index 7d6ee91..870e56d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/KbdType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/KbdType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/LiType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/LiType.java
index 2f9d2d2..95b2107 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/LiType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/LiType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ObjectType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ObjectType.java
index 38d20fc..6ae3225 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ObjectType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ObjectType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/OlType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/OlType.java
index 6481b8c..5b3fb20 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/OlType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/OlType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/PType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/PType.java
index 59e2858..35f5b78 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/PType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/PType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ParamType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ParamType.java
index 0b6227b..f055157 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ParamType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ParamType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/PreContent.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/PreContent.java
index 3d0d6eb..89adf92 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/PreContent.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/PreContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/PreType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/PreType.java
index 0e8a4e6..79b8787 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/PreType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/PreType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/QType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/QType.java
index a91e6ff..37a51a7 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/QType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/QType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SampType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SampType.java
index 188479e..87365de 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SampType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SampType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Scope.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Scope.java
index 620df36..e169a51 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Scope.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Scope.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Shape.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Shape.java
index 198f841..f0159a9 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Shape.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/Shape.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SmallType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SmallType.java
index 71d0cc5..f2e0c74 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SmallType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SmallType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SpanType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SpanType.java
index 6408be2..145b4df 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SpanType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SpanType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/StrikeType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/StrikeType.java
index 73a6eac..d0297e1 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/StrikeType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/StrikeType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/StrongType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/StrongType.java
index 5158dd1..2df17d9 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/StrongType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/StrongType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SubType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SubType.java
index 06633e7..0020323 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SubType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SubType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SupType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SupType.java
index 5f23930..8c64942 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SupType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/SupType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TableType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TableType.java
index 59656cd..3c4a392 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TableType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TableType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TbodyType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TbodyType.java
index 1a1c1b3..c900cdb 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TbodyType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TbodyType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TdType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TdType.java
index 48b8a98..be560da 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TdType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TdType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TfootType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TfootType.java
index 780d077..1ca7e19 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TfootType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TfootType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ThType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ThType.java
index a985da6..c14464d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ThType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ThType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TheadType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TheadType.java
index a940ba9..b3a94cc 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TheadType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TheadType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TrType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TrType.java
index 9cfb8b5..d2782e4 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TrType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TrType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TtType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TtType.java
index 0551466..de7a311 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TtType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/TtType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/UType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/UType.java
index e795207..c960948 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/UType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/UType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/UlType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/UlType.java
index 4e066a4..94a35e8 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/UlType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/UlType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ValignType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ValignType.java
index 545ad80..88b671c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ValignType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ValignType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ValuetypeType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ValuetypeType.java
index 9ec8fbb..d65b13a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ValuetypeType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/ValuetypeType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/VarType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/VarType.java
index 6d7ef31..91f4c81 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/VarType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/VarType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/XhtmlFactory.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/XhtmlFactory.java
index 4f55cc2..511137b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/XhtmlFactory.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/XhtmlFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/XhtmlPackage.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/XhtmlPackage.java
index 6e4c12b..4ee1620 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/XhtmlPackage.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/XhtmlPackage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/AContentImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/AContentImpl.java
index a418091..cb3f246 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/AContentImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/AContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ATypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ATypeImpl.java
index 5225006..fbf7230 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ATypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ATypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/AbbrTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/AbbrTypeImpl.java
index 36a4e11..42de159 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/AbbrTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/AbbrTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/AcronymTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/AcronymTypeImpl.java
index 9981b0b..9fb1857 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/AcronymTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/AcronymTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/AddressTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/AddressTypeImpl.java
index c36ee34..09b43b0 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/AddressTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/AddressTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BTypeImpl.java
index 37e22b1..7b568db 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BigTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BigTypeImpl.java
index 9f3ccf0..254a3b1 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BigTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BigTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BlockImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BlockImpl.java
index 0e024b3..b35649f 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BlockImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BlockImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BlockquoteTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BlockquoteTypeImpl.java
index c19cdbb..b1fb8fe 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BlockquoteTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BlockquoteTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BodyTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BodyTypeImpl.java
index 8e248b5..f191b2d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BodyTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BodyTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BrTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BrTypeImpl.java
index 8c2629b..8f62f74 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BrTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/BrTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/CaptionTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/CaptionTypeImpl.java
index 73a2cbd..f54ff52 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/CaptionTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/CaptionTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/CiteTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/CiteTypeImpl.java
index f22e793..9e0d05b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/CiteTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/CiteTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/CodeTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/CodeTypeImpl.java
index 3d1c899..7ab78c1 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/CodeTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/CodeTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ColTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ColTypeImpl.java
index 373abbb..f877788 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ColTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ColTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ColgroupTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ColgroupTypeImpl.java
index b89b830..dfbaab3 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ColgroupTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ColgroupTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DdTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DdTypeImpl.java
index 7f589d3..8ae10b9 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DdTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DdTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DelTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DelTypeImpl.java
index 2ec1dfb..d94928d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DelTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DelTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DfnTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DfnTypeImpl.java
index d1d590b..ef7aef7 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DfnTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DfnTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DivTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DivTypeImpl.java
index 74e03e4..340b2c7 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DivTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DivTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DlTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DlTypeImpl.java
index 6ee63e7..47248e8 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DlTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DlTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DocumentRootImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DocumentRootImpl.java
index 12ce509..bab335a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DocumentRootImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DocumentRootImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DtTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DtTypeImpl.java
index 648eed5..c5333a0 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DtTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/DtTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/EmTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/EmTypeImpl.java
index 975718c..ae529c2 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/EmTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/EmTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/FlowImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/FlowImpl.java
index ed434fe..947b8fc 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/FlowImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/FlowImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/FormContentImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/FormContentImpl.java
index 0f838bc..f5260c8 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/FormContentImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/FormContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H1TypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H1TypeImpl.java
index f90ca37..fded705 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H1TypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H1TypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H2TypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H2TypeImpl.java
index 28864c3..d190481 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H2TypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H2TypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H3TypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H3TypeImpl.java
index e7a171f..4344a81 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H3TypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H3TypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H4TypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H4TypeImpl.java
index fb4c0ab..777ae19 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H4TypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H4TypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H5TypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H5TypeImpl.java
index f334a08..e2a0455 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H5TypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H5TypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H6TypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H6TypeImpl.java
index 29e1247..1744fc4 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H6TypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/H6TypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/HrTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/HrTypeImpl.java
index 4335411..f235bef 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/HrTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/HrTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/HtmlTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/HtmlTypeImpl.java
index 5db9c2e..6434c82 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/HtmlTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/HtmlTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ITypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ITypeImpl.java
index 71f2bf3..f4cb84c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ITypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ITypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ImgTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ImgTypeImpl.java
index 85157bc..ee251ed 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ImgTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ImgTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/InlineImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/InlineImpl.java
index 267e266..e37f5ec 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/InlineImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/InlineImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/InsTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/InsTypeImpl.java
index 85354b1..6de724d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/InsTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/InsTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/KbdTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/KbdTypeImpl.java
index c1d7e85..ee542bb 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/KbdTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/KbdTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/LiTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/LiTypeImpl.java
index e0fa5ce..dd93c94 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/LiTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/LiTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ObjectTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ObjectTypeImpl.java
index b1ae429..9afd3a8 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ObjectTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ObjectTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/OlTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/OlTypeImpl.java
index d869dac..a295698 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/OlTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/OlTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/PTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/PTypeImpl.java
index a5b6851..5c70f49 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/PTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/PTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ParamTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ParamTypeImpl.java
index 5d3b974..257cc3b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ParamTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ParamTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/PreContentImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/PreContentImpl.java
index d7977de..4fac400 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/PreContentImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/PreContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/PreTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/PreTypeImpl.java
index 3d8578b..09d3dac 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/PreTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/PreTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/QTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/QTypeImpl.java
index d89bcb9..7654f6e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/QTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/QTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SampTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SampTypeImpl.java
index acca395..a4721c6 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SampTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SampTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SmallTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SmallTypeImpl.java
index 7bfad71..64d36fc 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SmallTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SmallTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SpanTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SpanTypeImpl.java
index 8c53385..7d2971d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SpanTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SpanTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/StrikeTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/StrikeTypeImpl.java
index 88d3412..586f9d0 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/StrikeTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/StrikeTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/StrongTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/StrongTypeImpl.java
index 63206e2..8425163 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/StrongTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/StrongTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SubTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SubTypeImpl.java
index d252978..cb9c270 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SubTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SubTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SupTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SupTypeImpl.java
index b980125..ffdefa9 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SupTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/SupTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TableTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TableTypeImpl.java
index 967d885..0d2f910 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TableTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TableTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TbodyTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TbodyTypeImpl.java
index c4d9db2..6fb1d9f 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TbodyTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TbodyTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TdTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TdTypeImpl.java
index 2c465ef..ad3590b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TdTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TdTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TfootTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TfootTypeImpl.java
index a2f6bf5..3c5241c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TfootTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TfootTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ThTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ThTypeImpl.java
index 1b14646..4c65030 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ThTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/ThTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TheadTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TheadTypeImpl.java
index 3496bec..e7cfe81 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TheadTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TheadTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TrTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TrTypeImpl.java
index 0a0c6cf..0bd4328 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TrTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TrTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TtTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TtTypeImpl.java
index 53d6df7..d3bc4b2 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TtTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/TtTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/UTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/UTypeImpl.java
index 6e6c852..b58db93 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/UTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/UTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/UlTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/UlTypeImpl.java
index bbf295d..807967a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/UlTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/UlTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/VarTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/VarTypeImpl.java
index e4c5235..a886df3 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/VarTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/VarTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/XhtmlFactoryImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/XhtmlFactoryImpl.java
index dbf5cff..6a8944e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/XhtmlFactoryImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/XhtmlFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/XhtmlPackageImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/XhtmlPackageImpl.java
index fac09cc..bd8b1d1 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/XhtmlPackageImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/impl/XhtmlPackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlAdapterFactory.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlAdapterFactory.java
index 1d4472c..d07026e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlAdapterFactory.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlResourceFactoryImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlResourceFactoryImpl.java
index 53f5a43..8926dc8 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlResourceFactoryImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlResourceImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlResourceImpl.java
index 9899794..3ca9601 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlResourceImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlResourceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlSwitch.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlSwitch.java
index f81f774..ca081d0 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlSwitch.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlSwitch.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlValidator.java
index 4cea986..7ce277d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlXMLProcessor.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlXMLProcessor.java
index 89ac72f..020fdb2 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlXMLProcessor.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/util/XhtmlXMLProcessor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/AContentValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/AContentValidator.java
index 0906c3d..88d7fcc 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/AContentValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/AContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ATypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ATypeValidator.java
index 31224e6..852d14d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ATypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ATypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/AbbrTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/AbbrTypeValidator.java
index 76ae943..af78c9d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/AbbrTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/AbbrTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/AcronymTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/AcronymTypeValidator.java
index f5560b4..b3d0007 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/AcronymTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/AcronymTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/AddressTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/AddressTypeValidator.java
index 87e3bdd..4b785fc 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/AddressTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/AddressTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BTypeValidator.java
index 1573c99..2f11dea 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BigTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BigTypeValidator.java
index 702e4b2..a776a34 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BigTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BigTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BlockValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BlockValidator.java
index 75b906e..abf0599 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BlockValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BlockValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BlockquoteTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BlockquoteTypeValidator.java
index 6a1e8c8..91a3230 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BlockquoteTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BlockquoteTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BodyTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BodyTypeValidator.java
index 4b0bec2..7c7c093 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BodyTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BodyTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BrTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BrTypeValidator.java
index 11bd951..eed4e22 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BrTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/BrTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/CaptionTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/CaptionTypeValidator.java
index 8f38fc1..ce2a604 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/CaptionTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/CaptionTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/CiteTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/CiteTypeValidator.java
index cee437f..deadbde 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/CiteTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/CiteTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/CodeTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/CodeTypeValidator.java
index 082c586..5d354b7 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/CodeTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/CodeTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ColTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ColTypeValidator.java
index 4fb3664..734e324 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ColTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ColTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ColgroupTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ColgroupTypeValidator.java
index 87af3cf..21bf2b0 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ColgroupTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ColgroupTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DdTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DdTypeValidator.java
index 6f132ff..166192e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DdTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DdTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DelTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DelTypeValidator.java
index ad2f744..89615c2 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DelTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DelTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DfnTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DfnTypeValidator.java
index 683cef9..4bbfbdb 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DfnTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DfnTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DivTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DivTypeValidator.java
index 7ea5224..4072505 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DivTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DivTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DlTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DlTypeValidator.java
index bd51929..162fc44 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DlTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DlTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DocumentRootValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DocumentRootValidator.java
index 5fa5e0d..f7a8a64 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DocumentRootValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DocumentRootValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DtTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DtTypeValidator.java
index 1249da5..a7e2cd5 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DtTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/DtTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/EmTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/EmTypeValidator.java
index 3accba7..314bd51 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/EmTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/EmTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/FlowValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/FlowValidator.java
index 44c334a..f5a922f 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/FlowValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/FlowValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/FormContentValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/FormContentValidator.java
index ca028c7..8e0274a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/FormContentValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/FormContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H1TypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H1TypeValidator.java
index 86afccc..3f79f12 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H1TypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H1TypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H2TypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H2TypeValidator.java
index e4ce092..43de4ca 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H2TypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H2TypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H3TypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H3TypeValidator.java
index 429cc29..ac8a10e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H3TypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H3TypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H4TypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H4TypeValidator.java
index 6a7455d..7074db4 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H4TypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H4TypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H5TypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H5TypeValidator.java
index 4aa4c25..8ad6886 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H5TypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H5TypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H6TypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H6TypeValidator.java
index afe7c90..4261cb9 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H6TypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/H6TypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/HrTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/HrTypeValidator.java
index 0406fa7..6af5d8f 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/HrTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/HrTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/HtmlTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/HtmlTypeValidator.java
index 14e838b..c2d66e9 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/HtmlTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/HtmlTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ITypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ITypeValidator.java
index a27fbba..814e3b8 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ITypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ITypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ImgTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ImgTypeValidator.java
index f24b074..32d9436 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ImgTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ImgTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/InlineValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/InlineValidator.java
index c1dd7cc..6c0fa51 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/InlineValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/InlineValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/InsTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/InsTypeValidator.java
index 4487f11..3781c2c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/InsTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/InsTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/KbdTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/KbdTypeValidator.java
index 0978b2f..3a1f556 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/KbdTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/KbdTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/LiTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/LiTypeValidator.java
index 28903be..4020050 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/LiTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/LiTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ObjectTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ObjectTypeValidator.java
index 9dca737..d0507e3 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ObjectTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ObjectTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/OlTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/OlTypeValidator.java
index 0aaa03a..a904e2f 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/OlTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/OlTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/PTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/PTypeValidator.java
index 053e99c..0f3a0dc 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/PTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/PTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ParamTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ParamTypeValidator.java
index caddcfb..c8ef8c3 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ParamTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ParamTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/PreContentValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/PreContentValidator.java
index 49bdeb6..d9393c2 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/PreContentValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/PreContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/PreTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/PreTypeValidator.java
index e6263a2..f09a2d8 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/PreTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/PreTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/QTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/QTypeValidator.java
index 75218c5..e0a3767 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/QTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/QTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SampTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SampTypeValidator.java
index c31d615..69303e3 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SampTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SampTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SmallTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SmallTypeValidator.java
index 7945d73..3cfa70c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SmallTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SmallTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SpanTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SpanTypeValidator.java
index 82e4d11..08c405c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SpanTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SpanTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/StrikeTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/StrikeTypeValidator.java
index c02e548..280eeff 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/StrikeTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/StrikeTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/StrongTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/StrongTypeValidator.java
index 1f04e51..d955d9f 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/StrongTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/StrongTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SubTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SubTypeValidator.java
index 4b03cb2..e05269c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SubTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SubTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SupTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SupTypeValidator.java
index 30d99bd..c2303bc 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SupTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/SupTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TableTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TableTypeValidator.java
index e292585..bf86040 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TableTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TableTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TbodyTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TbodyTypeValidator.java
index f8e843b..592d167 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TbodyTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TbodyTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TdTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TdTypeValidator.java
index 16401c7..5e0b045 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TdTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TdTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TfootTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TfootTypeValidator.java
index 8e322ca..fcad5bb 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TfootTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TfootTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ThTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ThTypeValidator.java
index 35cb8e3..664644d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ThTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/ThTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TheadTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TheadTypeValidator.java
index 5d77190..358fd12 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TheadTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TheadTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TrTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TrTypeValidator.java
index a187e74..18097d3 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TrTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TrTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TtTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TtTypeValidator.java
index c4ead22..c1dd2a2 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TtTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/TtTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/UTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/UTypeValidator.java
index eccd65a..144f29b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/UTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/UTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/UlTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/UlTypeValidator.java
index 0327ea0..71b9cba 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/UlTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/UlTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/VarTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/VarTypeValidator.java
index 50b4b74..474e420 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/VarTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xhtml/validation/VarTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ACCESSPOLICIESType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ACCESSPOLICIESType.java
index 5af816a..aec6cd6 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ACCESSPOLICIESType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ACCESSPOLICIESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ACCESSPOLICY.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ACCESSPOLICY.java
index 57ae2a5..6a9f57b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ACCESSPOLICY.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ACCESSPOLICY.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ACCESSPOLICYACCESSMODEENUM.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ACCESSPOLICYACCESSMODEENUM.java
index 1122bc2..7307394 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ACCESSPOLICYACCESSMODEENUM.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ACCESSPOLICYACCESSMODEENUM.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEDEFINITIONCOMPLEX.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEDEFINITIONCOMPLEX.java
index 0fd393c..8ca6959 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEDEFINITIONCOMPLEX.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEDEFINITIONCOMPLEX.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEDEFINITIONENUMERATION.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEDEFINITIONENUMERATION.java
index bc3b38f..642c062 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEDEFINITIONENUMERATION.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEDEFINITIONENUMERATION.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEDEFINITIONSIMPLE.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEDEFINITIONSIMPLE.java
index 0127118..c649e02 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEDEFINITIONSIMPLE.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEDEFINITIONSIMPLE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEDEFINITIONSType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEDEFINITIONSType.java
index 52f6ce3..2614dda 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEDEFINITIONSType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEDEFINITIONSType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEEMBEDDEDDOCUMENT.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEEMBEDDEDDOCUMENT.java
index 4f049c3..4195238 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEEMBEDDEDDOCUMENT.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEEMBEDDEDDOCUMENT.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEEMBEDDEDFILE.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEEMBEDDEDFILE.java
index 1424f54..c1922c1 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEEMBEDDEDFILE.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEEMBEDDEDFILE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEENUMERATION.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEENUMERATION.java
index 8d42eb9..a455818 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEENUMERATION.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEENUMERATION.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEFILEREFERENCE.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEFILEREFERENCE.java
index 6cbec1d..b37ad7c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEFILEREFERENCE.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEFILEREFERENCE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUESIMPLE.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUESIMPLE.java
index 5d470e9..3b41985 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUESIMPLE.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUESIMPLE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUESType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUESType.java
index 07138a6..5a606c5 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUESType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEXMLDATA.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEXMLDATA.java
index 2be1816..38ac96d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEXMLDATA.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ATTRIBUTEVALUEXMLDATA.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/BINARYCONTENT.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/BINARYCONTENT.java
index cdc3b1f..5c44a2a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/BINARYCONTENT.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/BINARYCONTENT.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/CHILDRENType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/CHILDRENType.java
index b73dbe2..d06f76b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/CHILDRENType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/CHILDRENType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/CHILDRENType1.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/CHILDRENType1.java
index 16fb4bd..47cf7c7 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/CHILDRENType1.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/CHILDRENType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONBINARYFILE.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONBINARYFILE.java
index fab35c6..5fece3b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONBINARYFILE.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONBINARYFILE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONBOOLEAN.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONBOOLEAN.java
index 4a55d8f..7937fbf 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONBOOLEAN.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONBOOLEAN.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONDATE.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONDATE.java
index 87d396d..34a320a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONDATE.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONDATE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONDATEFORMATENUM.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONDATEFORMATENUM.java
index b4ab03e..efb6f6a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONDATEFORMATENUM.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONDATEFORMATENUM.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONDOCUMENT.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONDOCUMENT.java
index 2f6899a..2e4101f 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONDOCUMENT.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONDOCUMENT.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONENUMERATION.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONENUMERATION.java
index b86cdda..79303c7 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONENUMERATION.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONENUMERATION.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONINTEGER.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONINTEGER.java
index 503dce1..6a66753 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONINTEGER.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONINTEGER.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONREAL.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONREAL.java
index d8d629c..88ec5cd 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONREAL.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONREAL.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONSTRING.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONSTRING.java
index 834e26d..c93c257 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONSTRING.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONSTRING.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONSType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONSType.java
index a9ba581..e1be0eb 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONSType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONSType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONXMLDATA.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONXMLDATA.java
index 9ca776b..3aec672 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONXMLDATA.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPEDEFINITIONXMLDATA.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPESType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPESType.java
index d65fe69..6231dea 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPESType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DATATYPESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFAULTVALUEType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFAULTVALUEType.java
index 5134910..ecf603c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFAULTVALUEType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFAULTVALUEType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFAULTVALUEType1.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFAULTVALUEType1.java
index bb38e98..52bace3 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFAULTVALUEType1.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFAULTVALUEType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFAULTVALUEType2.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFAULTVALUEType2.java
index e8931f8..35843b3 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFAULTVALUEType2.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFAULTVALUEType2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType.java
index 57c48a7..4cbe58d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType1.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType1.java
index 3921c74..c362958 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType1.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType2.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType2.java
index 0fefd73..f8dac29 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType2.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType3.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType3.java
index 8d86525..11a67e7 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType3.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType4.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType4.java
index 62b5af7..1a9c8f3 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType4.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType4.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType5.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType5.java
index 1068790..1791db2 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType5.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DEFINITIONType5.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DocumentRoot.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DocumentRoot.java
index c0ecd40..f15f117 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DocumentRoot.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/DocumentRoot.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/EMBEDDEDVALUE.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/EMBEDDEDVALUE.java
index 55b8406..1a6f882 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/EMBEDDEDVALUE.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/EMBEDDEDVALUE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ENUMVALUE.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ENUMVALUE.java
index d9f4c42..997c84d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ENUMVALUE.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/ENUMVALUE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/OBJECTType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/OBJECTType.java
index 49f8470..2881cb1 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/OBJECTType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/OBJECTType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/PROPERTIESType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/PROPERTIESType.java
index a45c601..faa5979 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/PROPERTIESType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/PROPERTIESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RELATIONGROUP.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RELATIONGROUP.java
index 2a6b3e4..02538b0 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RELATIONGROUP.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RELATIONGROUP.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RELATIONGROUPSType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RELATIONGROUPSType.java
index c954737..b4cc32d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RELATIONGROUPSType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RELATIONGROUPSType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RELATIONGROUPSType1.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RELATIONGROUPSType1.java
index 168fbe9..63dd525 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RELATIONGROUPSType1.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RELATIONGROUPSType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RELATIONTYPEType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RELATIONTYPEType.java
index f198bc4..793e160 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RELATIONTYPEType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RELATIONTYPEType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RIF.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RIF.java
index 214ae4d..e5a3fab 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RIF.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RIF.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RifFactory.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RifFactory.java
index 9f96f30..cee789f 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RifFactory.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RifFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RifPackage.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RifPackage.java
index 0367900..34c6178 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RifPackage.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/RifPackage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SOURCEType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SOURCEType.java
index 1c8a0a6..92f71e5 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SOURCEType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SOURCEType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECATTRIBUTESType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECATTRIBUTESType.java
index 849df90..90a2deb 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECATTRIBUTESType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECATTRIBUTESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECGROUP.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECGROUP.java
index 16dff7c..cbd87a2 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECGROUP.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECGROUP.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECGROUPSType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECGROUPSType.java
index bafb4ad..4f7871e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECGROUPSType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECGROUPSType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECGROUPSType1.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECGROUPSType1.java
index 45d7706..4acbc78 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECGROUPSType1.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECGROUPSType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHIESType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHIESType.java
index 605a1c9..2acdb43 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHIESType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHIESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHY.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHY.java
index e09f379..069051b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHY.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHY.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHYROOT.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHYROOT.java
index 4336735..0d123e5 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHYROOT.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHYROOT.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHYROOTSType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHYROOTSType.java
index 2c3357e..aed01f3 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHYROOTSType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHYROOTSType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHYROOTSType1.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHYROOTSType1.java
index 08c2cbb..f02432d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHYROOTSType1.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECHIERARCHYROOTSType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECIFIEDVALUESType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECIFIEDVALUESType.java
index 0c6c4c3..e82aaa9 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECIFIEDVALUESType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECIFIEDVALUESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECOBJECT.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECOBJECT.java
index ab1f707..e70170e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECOBJECT.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECOBJECT.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECOBJECTSType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECOBJECTSType.java
index 4335cf0..240160a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECOBJECTSType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECOBJECTSType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECOBJECTSType1.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECOBJECTSType1.java
index 6644a85..3f8b9a0 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECOBJECTSType1.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECOBJECTSType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECOBJECTSType2.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECOBJECTSType2.java
index 123d990..0067524 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECOBJECTSType2.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECOBJECTSType2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECRELATION.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECRELATION.java
index ece70f2..8d4930f 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECRELATION.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECRELATION.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECRELATIONSType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECRELATIONSType.java
index 44e4505..409878e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECRELATIONSType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECRELATIONSType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECRELATIONSType1.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECRELATIONSType1.java
index 5eb6371..815f5a2 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECRELATIONSType1.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECRELATIONSType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECRELATIONSType2.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECRELATIONSType2.java
index 8cd5a50..b14f9f6 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECRELATIONSType2.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECRELATIONSType2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECTYPE.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECTYPE.java
index 0539372..ad121fe 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECTYPE.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECTYPE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECTYPESType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECTYPESType.java
index 864e3f4..e392b30 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECTYPESType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECTYPESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECTYPESType1.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECTYPESType1.java
index af6622c..100074f 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECTYPESType1.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/SPECTYPESType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TARGETGROUPType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TARGETGROUPType.java
index a38d327..3d2c97a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TARGETGROUPType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TARGETGROUPType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TARGETType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TARGETType.java
index 1a31850..0f19107 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TARGETType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TARGETType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType.java
index 1011b9f..642b529 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType1.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType1.java
index ac8c0c2..7f6f302 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType1.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType2.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType2.java
index 955d60d..1983969 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType2.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType3.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType3.java
index dd4e873..78ccc9d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType3.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType4.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType4.java
index d2eb80c..b5991ac 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType4.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType4.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType5.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType5.java
index fc3a688..48daf1f 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType5.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType5.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType6.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType6.java
index 3ae8606..86a519d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType6.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/TYPEType6.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType.java
index ef4e601..46d5b47 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType1.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType1.java
index b2d8064..dfd1009 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType1.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType2.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType2.java
index 9054b4c..f67472a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType2.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType3.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType3.java
index 59a9375..9b3ea3b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType3.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType4.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType4.java
index 427252d..f8f923e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType4.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/VALUESType4.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/XHTMLCONTENT.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/XHTMLCONTENT.java
index 08fa5e1..f398ce9 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/XHTMLCONTENT.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/XHTMLCONTENT.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/XMLCONTENT.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/XMLCONTENT.java
index b84eb5a..46dac1b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/XMLCONTENT.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/XMLCONTENT.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ACCESSPOLICIESTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ACCESSPOLICIESTypeImpl.java
index a0c0016..1093dff 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ACCESSPOLICIESTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ACCESSPOLICIESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ACCESSPOLICYImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ACCESSPOLICYImpl.java
index 54b9137..874d5a7 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ACCESSPOLICYImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ACCESSPOLICYImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEDEFINITIONCOMPLEXImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEDEFINITIONCOMPLEXImpl.java
index 343e363..9a5fcfe 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEDEFINITIONCOMPLEXImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEDEFINITIONCOMPLEXImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEDEFINITIONENUMERATIONImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEDEFINITIONENUMERATIONImpl.java
index d4567d3..d1bae70 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEDEFINITIONENUMERATIONImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEDEFINITIONENUMERATIONImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEDEFINITIONSIMPLEImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEDEFINITIONSIMPLEImpl.java
index b9143ba..83b8173 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEDEFINITIONSIMPLEImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEDEFINITIONSIMPLEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEDEFINITIONSTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEDEFINITIONSTypeImpl.java
index 51bbde4..2906a7a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEDEFINITIONSTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEDEFINITIONSTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEEMBEDDEDDOCUMENTImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEEMBEDDEDDOCUMENTImpl.java
index 4a0ef41..f7f6961 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEEMBEDDEDDOCUMENTImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEEMBEDDEDDOCUMENTImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEEMBEDDEDFILEImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEEMBEDDEDFILEImpl.java
index 07ee3cb..70e1844 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEEMBEDDEDFILEImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEEMBEDDEDFILEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEENUMERATIONImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEENUMERATIONImpl.java
index 2956184..d047335 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEENUMERATIONImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEENUMERATIONImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEFILEREFERENCEImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEFILEREFERENCEImpl.java
index fa61c0b..9ef8690 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEFILEREFERENCEImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEFILEREFERENCEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUESIMPLEImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUESIMPLEImpl.java
index a5a83a8..5af2db3 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUESIMPLEImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUESIMPLEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUESTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUESTypeImpl.java
index 0812690..5777c50 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUESTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEXMLDATAImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEXMLDATAImpl.java
index d7a6727..8376b05 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEXMLDATAImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ATTRIBUTEVALUEXMLDATAImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/BINARYCONTENTImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/BINARYCONTENTImpl.java
index 107f6ab..b9e94d4 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/BINARYCONTENTImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/BINARYCONTENTImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/CHILDRENType1Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/CHILDRENType1Impl.java
index 755295f..e71bd30 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/CHILDRENType1Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/CHILDRENType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/CHILDRENTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/CHILDRENTypeImpl.java
index 8a1fea5..02291f4 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/CHILDRENTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/CHILDRENTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONBINARYFILEImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONBINARYFILEImpl.java
index 64f4662..2813154 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONBINARYFILEImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONBINARYFILEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONBOOLEANImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONBOOLEANImpl.java
index 2d9606f..131abc8 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONBOOLEANImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONBOOLEANImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONDATEImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONDATEImpl.java
index 2b0bad9..8e31799 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONDATEImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONDATEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONDOCUMENTImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONDOCUMENTImpl.java
index 4513020..3f14b89 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONDOCUMENTImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONDOCUMENTImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONENUMERATIONImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONENUMERATIONImpl.java
index 9b53888..f5740eb 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONENUMERATIONImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONENUMERATIONImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONINTEGERImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONINTEGERImpl.java
index d0c79a6..ffbc854 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONINTEGERImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONINTEGERImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONREALImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONREALImpl.java
index fa6ce56..04d50f3 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONREALImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONREALImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONSTRINGImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONSTRINGImpl.java
index b47dcfc..407d95b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONSTRINGImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONSTRINGImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONSTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONSTypeImpl.java
index 9fd789c..b9562af 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONSTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONSTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONXMLDATAImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONXMLDATAImpl.java
index ff18442..1cd448a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONXMLDATAImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPEDEFINITIONXMLDATAImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPESTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPESTypeImpl.java
index cff647b..74cda5b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPESTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DATATYPESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFAULTVALUEType1Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFAULTVALUEType1Impl.java
index d0c924b..8d3ce41 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFAULTVALUEType1Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFAULTVALUEType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFAULTVALUEType2Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFAULTVALUEType2Impl.java
index 72d2207..ee798d4 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFAULTVALUEType2Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFAULTVALUEType2Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFAULTVALUETypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFAULTVALUETypeImpl.java
index 33cf2e1..26d59be 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFAULTVALUETypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFAULTVALUETypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType1Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType1Impl.java
index a38997b..155a7e4 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType1Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType2Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType2Impl.java
index 7fbbf45..2bcfa8c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType2Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType2Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType3Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType3Impl.java
index 77e151a..9db76fd 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType3Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType3Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType4Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType4Impl.java
index 7e84914..2da7516 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType4Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType4Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType5Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType5Impl.java
index c6761ff..9d0f194 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType5Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONType5Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONTypeImpl.java
index bfeb479..8fa1628 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DEFINITIONTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DocumentRootImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DocumentRootImpl.java
index 1c1f3f9..496264b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DocumentRootImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/DocumentRootImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/EMBEDDEDVALUEImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/EMBEDDEDVALUEImpl.java
index f977e6a..e21d000 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/EMBEDDEDVALUEImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/EMBEDDEDVALUEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ENUMVALUEImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ENUMVALUEImpl.java
index f121b2e..a852352 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ENUMVALUEImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/ENUMVALUEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/OBJECTTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/OBJECTTypeImpl.java
index b81652f..fde331d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/OBJECTTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/OBJECTTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/PROPERTIESTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/PROPERTIESTypeImpl.java
index 7669095..37e834b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/PROPERTIESTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/PROPERTIESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RELATIONGROUPImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RELATIONGROUPImpl.java
index d4162ab..e2eb6c0 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RELATIONGROUPImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RELATIONGROUPImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RELATIONGROUPSType1Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RELATIONGROUPSType1Impl.java
index caaa856..01e5962 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RELATIONGROUPSType1Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RELATIONGROUPSType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RELATIONGROUPSTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RELATIONGROUPSTypeImpl.java
index 0530353..987c80a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RELATIONGROUPSTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RELATIONGROUPSTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RELATIONTYPETypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RELATIONTYPETypeImpl.java
index 8d5f153..408ae42 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RELATIONTYPETypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RELATIONTYPETypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RIFImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RIFImpl.java
index 57c1efc..6343b4e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RIFImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RIFImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RifFactoryImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RifFactoryImpl.java
index c71cdbd..81c1f59 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RifFactoryImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RifFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RifPackageImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RifPackageImpl.java
index 8dbc4ee..54c2a1e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RifPackageImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/RifPackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SOURCETypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SOURCETypeImpl.java
index be466d1..5458ecd 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SOURCETypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SOURCETypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECATTRIBUTESTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECATTRIBUTESTypeImpl.java
index 28f56cc..8ee49f5 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECATTRIBUTESTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECATTRIBUTESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECGROUPImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECGROUPImpl.java
index f624491..b4b9d17 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECGROUPImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECGROUPImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECGROUPSType1Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECGROUPSType1Impl.java
index 7a6c557..f78a297 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECGROUPSType1Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECGROUPSType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECGROUPSTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECGROUPSTypeImpl.java
index 1e2e472..44896a7 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECGROUPSTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECGROUPSTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHIESTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHIESTypeImpl.java
index d064664..6ecac00 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHIESTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHIESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHYImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHYImpl.java
index 4c0989f..9f48152 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHYImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHYImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHYROOTImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHYROOTImpl.java
index 371c817..0f5635f 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHYROOTImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHYROOTImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHYROOTSType1Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHYROOTSType1Impl.java
index fefbec1..542865d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHYROOTSType1Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHYROOTSType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHYROOTSTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHYROOTSTypeImpl.java
index 1b46f10..2e82f2e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHYROOTSTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECHIERARCHYROOTSTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECIFIEDVALUESTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECIFIEDVALUESTypeImpl.java
index 109fc58..2303a5a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECIFIEDVALUESTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECIFIEDVALUESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECOBJECTImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECOBJECTImpl.java
index 7884857..2bd223b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECOBJECTImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECOBJECTImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECOBJECTSType1Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECOBJECTSType1Impl.java
index e06df55..73f4123 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECOBJECTSType1Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECOBJECTSType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECOBJECTSType2Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECOBJECTSType2Impl.java
index 3194a34..fe8cc9c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECOBJECTSType2Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECOBJECTSType2Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECOBJECTSTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECOBJECTSTypeImpl.java
index 5c48bf9..b53f5c6 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECOBJECTSTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECOBJECTSTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECRELATIONImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECRELATIONImpl.java
index d6d6427..61050c2 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECRELATIONImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECRELATIONImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECRELATIONSType1Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECRELATIONSType1Impl.java
index 8378d6f..c95a2d9 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECRELATIONSType1Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECRELATIONSType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECRELATIONSType2Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECRELATIONSType2Impl.java
index 085b49d..7f973ca 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECRELATIONSType2Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECRELATIONSType2Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECRELATIONSTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECRELATIONSTypeImpl.java
index d8876af..b6e41df 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECRELATIONSTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECRELATIONSTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECTYPEImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECTYPEImpl.java
index f6a677f..9624b93 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECTYPEImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECTYPEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECTYPESType1Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECTYPESType1Impl.java
index 936b17e..1fe113b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECTYPESType1Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECTYPESType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECTYPESTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECTYPESTypeImpl.java
index 9341aaa..ff613cb 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECTYPESTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/SPECTYPESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TARGETGROUPTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TARGETGROUPTypeImpl.java
index a3de666..937ba5a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TARGETGROUPTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TARGETGROUPTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TARGETTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TARGETTypeImpl.java
index 5b33186..c4049b5 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TARGETTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TARGETTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType1Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType1Impl.java
index 5b0beb3..9bf4b07 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType1Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType2Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType2Impl.java
index 40cc9f2..7ae0d39 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType2Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType2Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType3Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType3Impl.java
index 9badb91..9ede658 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType3Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType3Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType4Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType4Impl.java
index 5dc9cc9..8888a7e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType4Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType4Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType5Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType5Impl.java
index 62c397e..9f346ac 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType5Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType5Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType6Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType6Impl.java
index 0bb2fbd..16e3c5e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType6Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPEType6Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPETypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPETypeImpl.java
index f2aef39..4928672 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPETypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/TYPETypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESType1Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESType1Impl.java
index 4c332ee..9afa5ba 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESType1Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESType2Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESType2Impl.java
index 582f123..defd490 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESType2Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESType2Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESType3Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESType3Impl.java
index b609921..9e30d63 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESType3Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESType3Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESType4Impl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESType4Impl.java
index 4366da6..6567922 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESType4Impl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESType4Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESTypeImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESTypeImpl.java
index a5b0ba2..1dc6267 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESTypeImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/VALUESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/XHTMLCONTENTImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/XHTMLCONTENTImpl.java
index e42e72e..ebc86ca 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/XHTMLCONTENTImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/XHTMLCONTENTImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/XMLCONTENTImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/XMLCONTENTImpl.java
index ff6d72a..588703e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/XMLCONTENTImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/impl/XMLCONTENTImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifAdapterFactory.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifAdapterFactory.java
index b4ed597..e8a72bc 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifAdapterFactory.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifResourceFactoryImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifResourceFactoryImpl.java
index be8d619..bbff2df 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifResourceFactoryImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifResourceImpl.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifResourceImpl.java
index 2c3da76..8de0bac 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifResourceImpl.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifResourceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifSwitch.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifSwitch.java
index 2cc5bcb..3c70b95 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifSwitch.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifSwitch.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifXMLLoad.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifXMLLoad.java
index fa208f6..0277792 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifXMLLoad.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifXMLLoad.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifXMLProcessor.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifXMLProcessor.java
index 6a8e59e..8d352de 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifXMLProcessor.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifXMLProcessor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifXMLSave.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifXMLSave.java
index 9ae31bb..bfede62 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifXMLSave.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/util/RifXMLSave.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ACCESSPOLICIESTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ACCESSPOLICIESTypeValidator.java
index 446ca02..48852b5 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ACCESSPOLICIESTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ACCESSPOLICIESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ACCESSPOLICYValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ACCESSPOLICYValidator.java
index b478538..b964507 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ACCESSPOLICYValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ACCESSPOLICYValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEDEFINITIONCOMPLEXValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEDEFINITIONCOMPLEXValidator.java
index ce464ed..6cc5811 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEDEFINITIONCOMPLEXValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEDEFINITIONCOMPLEXValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEDEFINITIONENUMERATIONValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEDEFINITIONENUMERATIONValidator.java
index 25bc333..6deba3a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEDEFINITIONENUMERATIONValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEDEFINITIONENUMERATIONValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEDEFINITIONSIMPLEValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEDEFINITIONSIMPLEValidator.java
index aebc7fa..d75ed34 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEDEFINITIONSIMPLEValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEDEFINITIONSIMPLEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEDEFINITIONSTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEDEFINITIONSTypeValidator.java
index 2dbc404..d976d29 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEDEFINITIONSTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEDEFINITIONSTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEEMBEDDEDDOCUMENTValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEEMBEDDEDDOCUMENTValidator.java
index 6c07d0d..1b6e11e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEEMBEDDEDDOCUMENTValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEEMBEDDEDDOCUMENTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEEMBEDDEDFILEValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEEMBEDDEDFILEValidator.java
index 7128f3d..332ebfe 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEEMBEDDEDFILEValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEEMBEDDEDFILEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEENUMERATIONValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEENUMERATIONValidator.java
index 1946f77..7b98299 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEENUMERATIONValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEENUMERATIONValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEFILEREFERENCEValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEFILEREFERENCEValidator.java
index 5e7f053..47200a1 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEFILEREFERENCEValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEFILEREFERENCEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUESIMPLEValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUESIMPLEValidator.java
index 6fabb8a..251ca28 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUESIMPLEValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUESIMPLEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUESTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUESTypeValidator.java
index 92db71c..a888db7 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUESTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEXMLDATAValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEXMLDATAValidator.java
index 5e3e88a..1f41392 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEXMLDATAValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ATTRIBUTEVALUEXMLDATAValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/BINARYCONTENTValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/BINARYCONTENTValidator.java
index bd18384..303f077 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/BINARYCONTENTValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/BINARYCONTENTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/CHILDRENType1Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/CHILDRENType1Validator.java
index 78d2982..ba84d88 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/CHILDRENType1Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/CHILDRENType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/CHILDRENTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/CHILDRENTypeValidator.java
index 500959d..6763d6f 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/CHILDRENTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/CHILDRENTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONBINARYFILEValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONBINARYFILEValidator.java
index e346375..3c57fc4 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONBINARYFILEValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONBINARYFILEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONBOOLEANValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONBOOLEANValidator.java
index 8bd3786..2944639 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONBOOLEANValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONBOOLEANValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONDATEValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONDATEValidator.java
index 103b3e3..545145e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONDATEValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONDATEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONDOCUMENTValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONDOCUMENTValidator.java
index c394e05..bf2b454 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONDOCUMENTValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONDOCUMENTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONENUMERATIONValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONENUMERATIONValidator.java
index cf7d414..179f648 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONENUMERATIONValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONENUMERATIONValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONINTEGERValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONINTEGERValidator.java
index 7189dfb..726c458 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONINTEGERValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONINTEGERValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONREALValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONREALValidator.java
index a547c5e..bd950fd 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONREALValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONREALValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONSTRINGValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONSTRINGValidator.java
index b5c69cd..d0f782e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONSTRINGValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONSTRINGValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONSTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONSTypeValidator.java
index 932799a..e143e1b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONSTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONSTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONXMLDATAValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONXMLDATAValidator.java
index a0a9ab4..15f7f84 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONXMLDATAValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPEDEFINITIONXMLDATAValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPESTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPESTypeValidator.java
index 320718e..f0025f5 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPESTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DATATYPESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFAULTVALUEType1Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFAULTVALUEType1Validator.java
index 885a540..13864cd 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFAULTVALUEType1Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFAULTVALUEType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFAULTVALUEType2Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFAULTVALUEType2Validator.java
index 4a53769..7fdcb97 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFAULTVALUEType2Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFAULTVALUEType2Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFAULTVALUETypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFAULTVALUETypeValidator.java
index 7e53618..81ead37 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFAULTVALUETypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFAULTVALUETypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType1Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType1Validator.java
index 7c93be2..22ffec2 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType1Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType2Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType2Validator.java
index f3e4856..dc20d99 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType2Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType2Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType3Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType3Validator.java
index 390197b..cb88b8e 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType3Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType3Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType4Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType4Validator.java
index e329be8..19891d7 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType4Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType4Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType5Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType5Validator.java
index 28225be..f1f2a44 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType5Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONType5Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONTypeValidator.java
index 3635b0e..567b187 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DEFINITIONTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DocumentRootValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DocumentRootValidator.java
index b524910..3d8f808 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DocumentRootValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/DocumentRootValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/EMBEDDEDVALUEValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/EMBEDDEDVALUEValidator.java
index b66ae14..4f35a18 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/EMBEDDEDVALUEValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/EMBEDDEDVALUEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ENUMVALUEValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ENUMVALUEValidator.java
index 1cd0dd2..cffe53c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ENUMVALUEValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/ENUMVALUEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/OBJECTTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/OBJECTTypeValidator.java
index 3ef1e36..3313cbf 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/OBJECTTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/OBJECTTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/PROPERTIESTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/PROPERTIESTypeValidator.java
index d4f6d8c..2c3ebef 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/PROPERTIESTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/PROPERTIESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RELATIONGROUPSType1Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RELATIONGROUPSType1Validator.java
index 327202f..13fd15f 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RELATIONGROUPSType1Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RELATIONGROUPSType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RELATIONGROUPSTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RELATIONGROUPSTypeValidator.java
index 76d8801..b4bb84b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RELATIONGROUPSTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RELATIONGROUPSTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RELATIONGROUPValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RELATIONGROUPValidator.java
index efe8654..ca78b09 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RELATIONGROUPValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RELATIONGROUPValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RELATIONTYPETypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RELATIONTYPETypeValidator.java
index 7e2b260..a36ab45 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RELATIONTYPETypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RELATIONTYPETypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RIFValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RIFValidator.java
index e5b7b70..4c06d49 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RIFValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/RIFValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SOURCETypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SOURCETypeValidator.java
index 260d925..9a664c0 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SOURCETypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SOURCETypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECATTRIBUTESTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECATTRIBUTESTypeValidator.java
index 1ae1dbc..a053add 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECATTRIBUTESTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECATTRIBUTESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECGROUPSType1Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECGROUPSType1Validator.java
index 811ee3a..25634f1 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECGROUPSType1Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECGROUPSType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECGROUPSTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECGROUPSTypeValidator.java
index 191915d..ed609cc 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECGROUPSTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECGROUPSTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECGROUPValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECGROUPValidator.java
index 12109af..0680402 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECGROUPValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECGROUPValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHIESTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHIESTypeValidator.java
index 5037bf5..b3fddfc 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHIESTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHIESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHYROOTSType1Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHYROOTSType1Validator.java
index f424cc7..cb43f4f 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHYROOTSType1Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHYROOTSType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHYROOTSTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHYROOTSTypeValidator.java
index e001093..27860f5 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHYROOTSTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHYROOTSTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHYROOTValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHYROOTValidator.java
index 6326fac..7e1bd2c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHYROOTValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHYROOTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHYValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHYValidator.java
index f18318b..da6c54d 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHYValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECHIERARCHYValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECIFIEDVALUESTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECIFIEDVALUESTypeValidator.java
index e1aeeaf..4e355ce 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECIFIEDVALUESTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECIFIEDVALUESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECOBJECTSType1Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECOBJECTSType1Validator.java
index 8425329..78b01e8 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECOBJECTSType1Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECOBJECTSType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECOBJECTSType2Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECOBJECTSType2Validator.java
index 1cb7986..118b8fa 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECOBJECTSType2Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECOBJECTSType2Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECOBJECTSTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECOBJECTSTypeValidator.java
index 61823cb..f982ea7 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECOBJECTSTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECOBJECTSTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECOBJECTValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECOBJECTValidator.java
index d668c26..173ccd7 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECOBJECTValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECOBJECTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECRELATIONSType1Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECRELATIONSType1Validator.java
index 72d00d4..8f3187b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECRELATIONSType1Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECRELATIONSType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECRELATIONSType2Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECRELATIONSType2Validator.java
index ed42aff..20a8d15 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECRELATIONSType2Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECRELATIONSType2Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECRELATIONSTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECRELATIONSTypeValidator.java
index 8e41aa5..7bed8e8 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECRELATIONSTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECRELATIONSTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECRELATIONValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECRELATIONValidator.java
index 7955fa6..fd8cf42 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECRELATIONValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECRELATIONValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECTYPESType1Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECTYPESType1Validator.java
index d2273a9..d80fcf8 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECTYPESType1Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECTYPESType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECTYPESTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECTYPESTypeValidator.java
index 283e664..1de6c9f 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECTYPESTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECTYPESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECTYPEValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECTYPEValidator.java
index 6a6b7c9..2d7aa44 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECTYPEValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/SPECTYPEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TARGETGROUPTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TARGETGROUPTypeValidator.java
index 2f3415e..63fa0a8 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TARGETGROUPTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TARGETGROUPTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TARGETTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TARGETTypeValidator.java
index 74a8033..cfa239b 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TARGETTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TARGETTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType1Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType1Validator.java
index 5d87926..73ddec7 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType1Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType2Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType2Validator.java
index 6981491..a56801a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType2Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType2Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType3Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType3Validator.java
index bd2827b..62691ee 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType3Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType3Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType4Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType4Validator.java
index b274844..48d9a99 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType4Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType4Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType5Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType5Validator.java
index fa40403..7271639 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType5Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType5Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType6Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType6Validator.java
index fb94702..5da3ce3 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType6Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPEType6Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPETypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPETypeValidator.java
index 2ab388f..017aa7a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPETypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/TYPETypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESType1Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESType1Validator.java
index 22af182..143c5ac 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESType1Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESType2Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESType2Validator.java
index 859c8ec..4c6eb77 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESType2Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESType2Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESType3Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESType3Validator.java
index b7ea2ed..312c143 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESType3Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESType3Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESType4Validator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESType4Validator.java
index a693fc8..a5ec933 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESType4Validator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESType4Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESTypeValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESTypeValidator.java
index da5efcc..d33924a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESTypeValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/VALUESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/XHTMLCONTENTValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/XHTMLCONTENTValidator.java
index 83ee1a9..ba7dc0a 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/XHTMLCONTENTValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/XHTMLCONTENTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/XMLCONTENTValidator.java b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/XMLCONTENTValidator.java
index 6abc817..d422b2c 100644
--- a/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/XMLCONTENTValidator.java
+++ b/org.eclipse.rmf.rif11.xsd.model/src/org/eclipse/rmf/rif11/xsd/validation/XMLCONTENTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model.test/META-INF/MANIFEST.MF b/org.eclipse.rmf.rif12.model.test/META-INF/MANIFEST.MF
index a8905b1..8ea960b 100644
--- a/org.eclipse.rmf.rif12.model.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.rif12.model.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.rif12.model.test

-Bundle-Version: 0.9.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Require-Bundle: org.eclipse.core.resources,

  org.eclipse.core.runtime,

  org.junit,

diff --git a/org.eclipse.rmf.rif12.model.test/about.html b/org.eclipse.rmf.rif12.model.test/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.rif12.model.test/about.html
+++ b/org.eclipse.rmf.rif12.model.test/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif12.model.test/build.properties b/org.eclipse.rmf.rif12.model.test/build.properties
index e5b0bda..0d0b5f3 100644
--- a/org.eclipse.rmf.rif12.model.test/build.properties
+++ b/org.eclipse.rmf.rif12.model.test/build.properties
@@ -1,3 +1,4 @@
+###############################################################################

 # Copyright (c) 2011 itemis GmbH.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

@@ -6,7 +7,11 @@
 #

 # Contributors:

 #     Nirmal Sasidharan - initial API and implementation

+###############################################################################

 source.. = src/

 bin.includes = META-INF/,\

                .,\

-               plugin.properties

+               plugin.properties,\

+               about.html,\

+               epl-v10.html,\

+               notice.html

diff --git a/org.eclipse.rmf.rif12.model.test/epl-v10.html b/org.eclipse.rmf.rif12.model.test/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.rif12.model.test/epl-v10.html
+++ b/org.eclipse.rmf.rif12.model.test/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif12.model.test/notice.html b/org.eclipse.rmf.rif12.model.test/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.rif12.model.test/notice.html
+++ b/org.eclipse.rmf.rif12.model.test/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.rif12.model.test/plugin.properties b/org.eclipse.rmf.rif12.model.test/plugin.properties
index e94c085..fe06427 100644
--- a/org.eclipse.rmf.rif12.model.test/plugin.properties
+++ b/org.eclipse.rmf.rif12.model.test/plugin.properties
@@ -1,3 +1,4 @@
+###############################################################################

 # Copyright (c) 2011 itemis GmbH.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

@@ -6,5 +7,6 @@
 #

 # Contributors:

 #     Nirmal Sasidharan - initial API and implementation

+###############################################################################

 pluginName = Rif12 Model Tests (Incubation)

 providerName = Eclipse Modeling Project

diff --git a/org.eclipse.rmf.rif12.model.test/pom.xml b/org.eclipse.rmf.rif12.model.test/pom.xml
index ee9e301..fd84496 100644
--- a/org.eclipse.rmf.rif12.model.test/pom.xml
+++ b/org.eclipse.rmf.rif12.model.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<groupId>org.eclipse.rmf.plugins</groupId>

 	<artifactId>org.eclipse.rmf.rif12.model.test</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

+	<version>0.10.0-SNAPSHOT</version>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

@@ -46,7 +46,7 @@
 			<plugin>

 				<groupId>org.eclipse.tycho</groupId>

 				<artifactId>tycho-surefire-plugin</artifactId>

-				<version>${tycho-version}</version>

+				<version>${tycho.version}</version>

 				<configuration>

 					<includes>

 						<include>**/All*Tests.class</include>

diff --git a/org.eclipse.rmf.rif12.model.test/src/org/eclipse/rmf/rif12/model/test/AllTests.java b/org.eclipse.rmf.rif12.model.test/src/org/eclipse/rmf/rif12/model/test/AllTests.java
index e38e43d..e14f8e1 100644
--- a/org.eclipse.rmf.rif12.model.test/src/org/eclipse/rmf/rif12/model/test/AllTests.java
+++ b/org.eclipse.rmf.rif12.model.test/src/org/eclipse/rmf/rif12/model/test/AllTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************

+ * Copyright (c) 2014 itemis AG and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     Mark Broerkens (itemis AG) - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.rmf.rif12.model.test;

 

 import org.junit.runner.RunWith;

diff --git a/org.eclipse.rmf.rif12.model.test/src/org/eclipse/rmf/rif12/model/test/ReferenceDataTests.java b/org.eclipse.rmf.rif12.model.test/src/org/eclipse/rmf/rif12/model/test/ReferenceDataTests.java
index d94286a..77aecd1 100644
--- a/org.eclipse.rmf.rif12.model.test/src/org/eclipse/rmf/rif12/model/test/ReferenceDataTests.java
+++ b/org.eclipse.rmf.rif12.model.test/src/org/eclipse/rmf/rif12/model/test/ReferenceDataTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.rif12.model.test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/org.eclipse.rmf.rif12.model.test/src/org/eclipse/rmf/rif12/model/test/Rif12ResourceTestBase.java b/org.eclipse.rmf.rif12.model.test/src/org/eclipse/rmf/rif12/model/test/Rif12ResourceTestBase.java
index 5e598fb..205f560 100644
--- a/org.eclipse.rmf.rif12.model.test/src/org/eclipse/rmf/rif12/model/test/Rif12ResourceTestBase.java
+++ b/org.eclipse.rmf.rif12.model.test/src/org/eclipse/rmf/rif12/model/test/Rif12ResourceTestBase.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2013 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/META-INF/MANIFEST.MF b/org.eclipse.rmf.rif12.model/META-INF/MANIFEST.MF
index aa3338a..c0d50e7 100644
--- a/org.eclipse.rmf.rif12.model/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.rif12.model/META-INF/MANIFEST.MF
@@ -2,19 +2,16 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.rif12.model;singleton:=true

-Bundle-Version: 0.9.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Export-Package: org.eclipse.rmf.rif12.DataTypes,

- org.eclipse.rmf.rif12.DataTypes.impl,

- org.eclipse.rmf.rif12.DataTypes.util,

- org.eclipse.rmf.rif12.EA_AUTOSARM2_Types_Package,

- org.eclipse.rmf.rif12.EA_AUTOSARM2_Types_Package.impl,

- org.eclipse.rmf.rif12.ExchangeFile,

- org.eclipse.rmf.rif12.ExchangeFile.impl,

- org.eclipse.rmf.rif12.ExchangeFile.util

+Export-Package: org.eclipse.rmf.rif12.DataTypes,org.eclipse.rmf.rif12.

+ DataTypes.impl,org.eclipse.rmf.rif12.DataTypes.util,org.eclipse.rmf.r

+ if12.EA_AUTOSARM2_Types_Package,org.eclipse.rmf.rif12.EA_AUTOSARM2_Ty

+ pes_Package.impl,org.eclipse.rmf.rif12.ExchangeFile,org.eclipse.rmf.r

+ if12.ExchangeFile.impl,org.eclipse.rmf.rif12.ExchangeFile.util

 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",

  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,

  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)"

diff --git a/org.eclipse.rmf.rif12.model/about.html b/org.eclipse.rmf.rif12.model/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.rif12.model/about.html
+++ b/org.eclipse.rmf.rif12.model/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif12.model/build.properties b/org.eclipse.rmf.rif12.model/build.properties
index 79070dd..edb1e8b 100644
--- a/org.eclipse.rmf.rif12.model/build.properties
+++ b/org.eclipse.rmf.rif12.model/build.properties
@@ -1,3 +1,4 @@
+###############################################################################

 # Copyright (c) 2011 itemis GmbH.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

@@ -6,11 +7,15 @@
 #

 # Contributors:

 #     Nirmal Sasidharan - initial API and implementation

+###############################################################################

 bin.includes = .,\

                model/,\

                META-INF/,\

                plugin.xml,\

-               plugin.properties

+               plugin.properties,\

+               about.html,\

+               epl-v10.html,\

+               notice.html

 jars.compile.order = .

 source.. = src/

 output.. = bin/

diff --git a/org.eclipse.rmf.rif12.model/epl-v10.html b/org.eclipse.rmf.rif12.model/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.rif12.model/epl-v10.html
+++ b/org.eclipse.rmf.rif12.model/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif12.model/notice.html b/org.eclipse.rmf.rif12.model/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.rif12.model/notice.html
+++ b/org.eclipse.rmf.rif12.model/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.rif12.model/plugin.properties b/org.eclipse.rmf.rif12.model/plugin.properties
index 67014be..aee1317 100644
--- a/org.eclipse.rmf.rif12.model/plugin.properties
+++ b/org.eclipse.rmf.rif12.model/plugin.properties
@@ -1,3 +1,4 @@
+###############################################################################

 # Copyright (c) 2011 itemis GmbH.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

@@ -6,5 +7,6 @@
 #

 # Contributors:

 #     Nirmal Sasidharan - initial API and implementation

+###############################################################################

 pluginName = Rif12 Model (Incubation)

 providerName = Eclipse Modeling Project

diff --git a/org.eclipse.rmf.rif12.model/pom.xml b/org.eclipse.rmf.rif12.model/pom.xml
index 1811282..25cb8da 100644
--- a/org.eclipse.rmf.rif12.model/pom.xml
+++ b/org.eclipse.rmf.rif12.model/pom.xml
@@ -6,31 +6,13 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.rif12.model</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

 	<packaging>eclipse-plugin</packaging>

 	<groupId>org.eclipse.rmf.plugins</groupId>

- 	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.eclipse.tycho</groupId>

-				<artifactId>tycho-source-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<executions>

-					<execution>

-						<id>plugin-source</id>

-						<goals>

-							<goal>plugin-source</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/BinaryContent.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/BinaryContent.java
index 7eb78ee..98efd1c 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/BinaryContent.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/BinaryContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/DataTypesFactory.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/DataTypesFactory.java
index 1e87a30..d4a59f0 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/DataTypesFactory.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/DataTypesFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/DataTypesPackage.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/DataTypesPackage.java
index edba3b9..b7c6da0 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/DataTypesPackage.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/DataTypesPackage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/XhtmlContent.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/XhtmlContent.java
index b2c4c6e..fc30e1d 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/XhtmlContent.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/XhtmlContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/XmlContent.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/XmlContent.java
index 1d8d587..509ea0d 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/XmlContent.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/XmlContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/BinaryContentImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/BinaryContentImpl.java
index 61ea0d8..29226c5 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/BinaryContentImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/BinaryContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/DataTypesFactoryImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/DataTypesFactoryImpl.java
index da41609..9a39f80 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/DataTypesFactoryImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/DataTypesFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/DataTypesPackageImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/DataTypesPackageImpl.java
index c1c485b..6dff592 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/DataTypesPackageImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/DataTypesPackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/XhtmlContentImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/XhtmlContentImpl.java
index 284946a..378b739 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/XhtmlContentImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/XhtmlContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/XmlContentImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/XmlContentImpl.java
index 4e1f79b..865d86a 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/XmlContentImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/impl/XmlContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/util/DataTypesAdapterFactory.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/util/DataTypesAdapterFactory.java
index a20e652..f3728d0 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/util/DataTypesAdapterFactory.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/util/DataTypesAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/util/DataTypesSwitch.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/util/DataTypesSwitch.java
index 817c12d..9051b90 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/util/DataTypesSwitch.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/util/DataTypesSwitch.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/validation/BinaryContentValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/validation/BinaryContentValidator.java
index 4402362..1bb850b 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/validation/BinaryContentValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/validation/BinaryContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/validation/XhtmlContentValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/validation/XhtmlContentValidator.java
index a62680a..e9f0bce 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/validation/XhtmlContentValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/validation/XhtmlContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/validation/XmlContentValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/validation/XmlContentValidator.java
index dc90918..9d691ec 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/validation/XmlContentValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/DataTypes/validation/XmlContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/AccessPolicyAccessModeEnum.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/AccessPolicyAccessModeEnum.java
index 1de4f90..7a01944 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/AccessPolicyAccessModeEnum.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/AccessPolicyAccessModeEnum.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/DatatypeDefinitionDateFormatEnum.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/DatatypeDefinitionDateFormatEnum.java
index 39dc106..cb8b3c1 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/DatatypeDefinitionDateFormatEnum.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/DatatypeDefinitionDateFormatEnum.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/EA_AUTOSARM2_Types_PackageFactory.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/EA_AUTOSARM2_Types_PackageFactory.java
index 058993f..85d5081 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/EA_AUTOSARM2_Types_PackageFactory.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/EA_AUTOSARM2_Types_PackageFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/EA_AUTOSARM2_Types_PackagePackage.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/EA_AUTOSARM2_Types_PackagePackage.java
index 2e799c8..b6f1eb0 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/EA_AUTOSARM2_Types_PackagePackage.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/EA_AUTOSARM2_Types_PackagePackage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/impl/EA_AUTOSARM2_Types_PackageFactoryImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/impl/EA_AUTOSARM2_Types_PackageFactoryImpl.java
index 1252140..5680776 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/impl/EA_AUTOSARM2_Types_PackageFactoryImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/impl/EA_AUTOSARM2_Types_PackageFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/impl/EA_AUTOSARM2_Types_PackagePackageImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/impl/EA_AUTOSARM2_Types_PackagePackageImpl.java
index 5075522..24ea6ae 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/impl/EA_AUTOSARM2_Types_PackagePackageImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/EA_AUTOSARM2_Types_Package/impl/EA_AUTOSARM2_Types_PackagePackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AccessPolicy.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AccessPolicy.java
index 2603fab..c26e04c 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AccessPolicy.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AccessPolicy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeDefinition.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeDefinition.java
index 5a3b0fc..6475841 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeDefinition.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeDefinition.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeDefinitionComplex.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeDefinitionComplex.java
index 2e2d9ab..61c46d9 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeDefinitionComplex.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeDefinitionComplex.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeDefinitionEnumeration.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeDefinitionEnumeration.java
index eb4df36..73c4435 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeDefinitionEnumeration.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeDefinitionEnumeration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeDefinitionSimple.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeDefinitionSimple.java
index 2987889..ccdc178 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeDefinitionSimple.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeDefinitionSimple.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueComplex.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueComplex.java
index 180dfed..b3bdaa9 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueComplex.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueComplex.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueEmbeddedDocument.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueEmbeddedDocument.java
index 74d6e13..9cf0f9c 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueEmbeddedDocument.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueEmbeddedDocument.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueEmbeddedFile.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueEmbeddedFile.java
index ed729a8..06a98d7 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueEmbeddedFile.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueEmbeddedFile.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueEnumeration.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueEnumeration.java
index c3509a8..4f5ecfc 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueEnumeration.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueEnumeration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueFileReference.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueFileReference.java
index 87fb57c..2e88f16 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueFileReference.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueFileReference.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueSimple.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueSimple.java
index 76b2dc4..3578410 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueSimple.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueSimple.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueXmlData.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueXmlData.java
index 35dbe97..53f1717 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueXmlData.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/AttributeValueXmlData.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinition.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinition.java
index 9c03a72..2d18dd4 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinition.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinition.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionBinaryFile.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionBinaryFile.java
index 7c5e3ac..c7cdff4 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionBinaryFile.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionBinaryFile.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionBoolean.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionBoolean.java
index 512c9f0..7c9e760 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionBoolean.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionBoolean.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionComplex.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionComplex.java
index dd866df..5d611fa 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionComplex.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionComplex.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionDate.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionDate.java
index 6915a1c..8f13fe2 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionDate.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionDate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionDocument.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionDocument.java
index 026a341..feae9e9 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionDocument.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionDocument.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionEnumeration.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionEnumeration.java
index 4fe5d4d..6962e24 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionEnumeration.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionEnumeration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionInteger.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionInteger.java
index 2cae2ed..ca229c3 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionInteger.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionInteger.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionReal.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionReal.java
index 99df466..cd6395a 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionReal.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionReal.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionSimple.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionSimple.java
index 769fca2..ee477f3 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionSimple.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionSimple.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionString.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionString.java
index 8bca431..385de64 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionString.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionString.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionXmlData.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionXmlData.java
index 64d56d6..1d7a925 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionXmlData.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/DatatypeDefinitionXmlData.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/EmbeddedValue.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/EmbeddedValue.java
index ee4c85b..dcc7ea9 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/EmbeddedValue.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/EmbeddedValue.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/EnumValue.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/EnumValue.java
index d7a0b62..4f1be44 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/EnumValue.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/EnumValue.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/ExchangeFileFactory.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/ExchangeFileFactory.java
index 37c357a..89b5030 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/ExchangeFileFactory.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/ExchangeFileFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/ExchangeFilePackage.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/ExchangeFilePackage.java
index a76e4be..e376408 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/ExchangeFilePackage.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/ExchangeFilePackage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/Identifiable.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/Identifiable.java
index 41b4e94..bb95b6e 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/Identifiable.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/Identifiable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/RIF.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/RIF.java
index 87bd40b..5affdfd 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/RIF.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/RIF.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/RIFContent.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/RIFContent.java
index 6a29b5a..ccb4b96 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/RIFContent.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/RIFContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/RIFHeader.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/RIFHeader.java
index af28d27..dbccbca 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/RIFHeader.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/RIFHeader.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/RIFToolExtension.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/RIFToolExtension.java
index ef10b2e..28b0d06 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/RIFToolExtension.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/RIFToolExtension.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/SpecElementWithUserDefinedAttributes.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/SpecElementWithUserDefinedAttributes.java
index 37d5551..89a6cbe 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/SpecElementWithUserDefinedAttributes.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/SpecElementWithUserDefinedAttributes.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/SpecGroupHierarchy.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/SpecGroupHierarchy.java
index c2f84da..8b6a13f 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/SpecGroupHierarchy.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/SpecGroupHierarchy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/SpecGroupHierarchyRoot.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/SpecGroupHierarchyRoot.java
index 744046d..9898447 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/SpecGroupHierarchyRoot.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/SpecGroupHierarchyRoot.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AccessPolicyImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AccessPolicyImpl.java
index 2292022..0d1df54 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AccessPolicyImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AccessPolicyImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeDefinitionComplexImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeDefinitionComplexImpl.java
index 5087d2f..3ba1612 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeDefinitionComplexImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeDefinitionComplexImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeDefinitionEnumerationImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeDefinitionEnumerationImpl.java
index 065de34..0de42e9 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeDefinitionEnumerationImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeDefinitionEnumerationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeDefinitionImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeDefinitionImpl.java
index d05224b..3212135 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeDefinitionImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeDefinitionImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeDefinitionSimpleImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeDefinitionSimpleImpl.java
index 2533669..d64ad23 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeDefinitionSimpleImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeDefinitionSimpleImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueComplexImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueComplexImpl.java
index c18a633..918a146 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueComplexImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueComplexImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueEmbeddedDocumentImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueEmbeddedDocumentImpl.java
index 1f475cd..3eea368 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueEmbeddedDocumentImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueEmbeddedDocumentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueEmbeddedFileImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueEmbeddedFileImpl.java
index e6d1ae1..4a96b2e 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueEmbeddedFileImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueEmbeddedFileImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueEnumerationImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueEnumerationImpl.java
index 441aa86..4199683 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueEnumerationImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueEnumerationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueFileReferenceImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueFileReferenceImpl.java
index 8847797..673ed4b 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueFileReferenceImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueFileReferenceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueImpl.java
index 64c1c18..6d6451f 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueSimpleImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueSimpleImpl.java
index 53cec56..6c0c3c1 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueSimpleImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueSimpleImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueXmlDataImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueXmlDataImpl.java
index 62ca7d5..236a999 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueXmlDataImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/AttributeValueXmlDataImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionBinaryFileImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionBinaryFileImpl.java
index 7d7822b..c1df0a7 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionBinaryFileImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionBinaryFileImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionBooleanImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionBooleanImpl.java
index 1f023f9..68bf53c 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionBooleanImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionBooleanImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionComplexImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionComplexImpl.java
index c453591..e16f630 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionComplexImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionComplexImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionDateImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionDateImpl.java
index 1e00aa5..c10d516 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionDateImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionDateImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionDocumentImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionDocumentImpl.java
index fe4d144..c3f900c 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionDocumentImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionDocumentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionEnumerationImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionEnumerationImpl.java
index 52f96fe..b61a0ae 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionEnumerationImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionEnumerationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionImpl.java
index 6919431..3dee184 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionIntegerImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionIntegerImpl.java
index 28fce2f..126018f 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionIntegerImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionIntegerImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionRealImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionRealImpl.java
index bfaf347..d78abd4 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionRealImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionRealImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionSimpleImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionSimpleImpl.java
index ee37945..8e5f57f 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionSimpleImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionSimpleImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionStringImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionStringImpl.java
index 5b72696..6d873af 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionStringImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionStringImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionXmlDataImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionXmlDataImpl.java
index a66c7f2..2472df3 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionXmlDataImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/DatatypeDefinitionXmlDataImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/EmbeddedValueImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/EmbeddedValueImpl.java
index 0e73081..48f1b6f 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/EmbeddedValueImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/EmbeddedValueImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/EnumValueImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/EnumValueImpl.java
index 467bf22..9674130 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/EnumValueImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/EnumValueImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/ExchangeFileFactoryImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/ExchangeFileFactoryImpl.java
index 3ff4ef8..c25fd13 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/ExchangeFileFactoryImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/ExchangeFileFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/ExchangeFilePackageImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/ExchangeFilePackageImpl.java
index da430ab..8b3a8b1 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/ExchangeFilePackageImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/ExchangeFilePackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/IdentifiableImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/IdentifiableImpl.java
index 19db9fe..99eadc0 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/IdentifiableImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/IdentifiableImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RIFContentImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RIFContentImpl.java
index bad6145..715bacb 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RIFContentImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RIFContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RIFHeaderImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RIFHeaderImpl.java
index fc656e9..ea4b01f 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RIFHeaderImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RIFHeaderImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RIFImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RIFImpl.java
index c7d75bb..4cc2fa1 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RIFImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RIFImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RIFToolExtensionImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RIFToolExtensionImpl.java
index cf3112a..b4cf6b7 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RIFToolExtensionImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RIFToolExtensionImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RelationGroupImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RelationGroupImpl.java
index c8383bf..340feda 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RelationGroupImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/RelationGroupImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecElementWithUserDefinedAttributesImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecElementWithUserDefinedAttributesImpl.java
index eea7591..34f7b27 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecElementWithUserDefinedAttributesImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecElementWithUserDefinedAttributesImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecGroupHierarchyImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecGroupHierarchyImpl.java
index 7a3229b..d330f20 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecGroupHierarchyImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecGroupHierarchyImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecGroupHierarchyRootImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecGroupHierarchyRootImpl.java
index 12de145..2a53877 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecGroupHierarchyRootImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecGroupHierarchyRootImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecGroupImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecGroupImpl.java
index a1da605..41b901f 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecGroupImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecGroupImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecHierarchyImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecHierarchyImpl.java
index de13b5e..51539fd 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecHierarchyImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecHierarchyImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecHierarchyRootImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecHierarchyRootImpl.java
index 7e0eee0..d801a79 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecHierarchyRootImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecHierarchyRootImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecObjectImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecObjectImpl.java
index cff60ff..a9cb4a6 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecObjectImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecObjectImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecRelationImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecRelationImpl.java
index f79a443..2e88f78 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecRelationImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecRelationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecTypeImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecTypeImpl.java
index 02565f5..e089658 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecTypeImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/impl/SpecTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileAdapterFactory.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileAdapterFactory.java
index d0b944b..8850df8 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileAdapterFactory.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileResourceFactoryImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileResourceFactoryImpl.java
index 2525cc5..8b9dae6 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileResourceFactoryImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileResourceImpl.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileResourceImpl.java
index c27c3fd..1894141 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileResourceImpl.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileResourceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileSwitch.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileSwitch.java
index 8ddcdaf..3dd255a 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileSwitch.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileSwitch.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileXMLProcessor.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileXMLProcessor.java
index ab3bc51..b8d67f0 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileXMLProcessor.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/util/ExchangeFileXMLProcessor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AccessPolicyValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AccessPolicyValidator.java
index f0ebc28..2462da9 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AccessPolicyValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AccessPolicyValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeDefinitionComplexValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeDefinitionComplexValidator.java
index 0e4db24..92de9d3 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeDefinitionComplexValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeDefinitionComplexValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeDefinitionEnumerationValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeDefinitionEnumerationValidator.java
index f80fcaa..e01db80 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeDefinitionEnumerationValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeDefinitionEnumerationValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeDefinitionSimpleValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeDefinitionSimpleValidator.java
index 755e8bf..401e710 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeDefinitionSimpleValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeDefinitionSimpleValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeDefinitionValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeDefinitionValidator.java
index 7da26a5..8f7452d 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeDefinitionValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeDefinitionValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueComplexValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueComplexValidator.java
index 97deb1e..b35b954 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueComplexValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueComplexValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueEmbeddedDocumentValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueEmbeddedDocumentValidator.java
index a207c7d..e555b33 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueEmbeddedDocumentValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueEmbeddedDocumentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueEmbeddedFileValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueEmbeddedFileValidator.java
index 54b0baf..5747504 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueEmbeddedFileValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueEmbeddedFileValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueEnumerationValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueEnumerationValidator.java
index 4da2871..b9928c2 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueEnumerationValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueEnumerationValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueFileReferenceValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueFileReferenceValidator.java
index bc13b31..7e30726 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueFileReferenceValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueFileReferenceValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueSimpleValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueSimpleValidator.java
index 97ed52e..eae95cf 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueSimpleValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueSimpleValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueValidator.java
index f5f1304..3b2dcff 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueXmlDataValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueXmlDataValidator.java
index db854fa..10f5a26 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueXmlDataValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/AttributeValueXmlDataValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionBinaryFileValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionBinaryFileValidator.java
index 8b7511b..7f38fcd 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionBinaryFileValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionBinaryFileValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionBooleanValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionBooleanValidator.java
index 14adda7..41e15ec 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionBooleanValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionBooleanValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionComplexValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionComplexValidator.java
index 90f706f..017cf34 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionComplexValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionComplexValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionDateValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionDateValidator.java
index 0f0291d..7e11946 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionDateValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionDateValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionDocumentValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionDocumentValidator.java
index e18ac0c..5e8f35d 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionDocumentValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionDocumentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionEnumerationValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionEnumerationValidator.java
index edb8e17..02909c1 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionEnumerationValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionEnumerationValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionIntegerValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionIntegerValidator.java
index 11a9dac..53a02c7 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionIntegerValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionIntegerValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionRealValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionRealValidator.java
index 74adc7c..252c0e2 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionRealValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionRealValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionSimpleValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionSimpleValidator.java
index 900e7c0..75bd4a8 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionSimpleValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionSimpleValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionStringValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionStringValidator.java
index e9f2ce4..5025cbd 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionStringValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionStringValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionValidator.java
index c4925c0..d3bdb8a 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionXmlDataValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionXmlDataValidator.java
index 3dd1f13..061183b 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionXmlDataValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/DatatypeDefinitionXmlDataValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/EmbeddedValueValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/EmbeddedValueValidator.java
index df45cb1..48e04db 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/EmbeddedValueValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/EmbeddedValueValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/EnumValueValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/EnumValueValidator.java
index d331a3c..9c6a273 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/EnumValueValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/EnumValueValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/IdentifiableValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/IdentifiableValidator.java
index 45f7c08..e6f0b1d 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/IdentifiableValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/IdentifiableValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RIFContentValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RIFContentValidator.java
index c22c518..daf90a3 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RIFContentValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RIFContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RIFHeaderValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RIFHeaderValidator.java
index c82855b..739c3ff 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RIFHeaderValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RIFHeaderValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RIFToolExtensionValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RIFToolExtensionValidator.java
index 741fbce..7c4af8a 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RIFToolExtensionValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RIFToolExtensionValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RIFValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RIFValidator.java
index 6248930..4d32e04 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RIFValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RIFValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RelationGroupValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RelationGroupValidator.java
index 501870a..c731af1 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RelationGroupValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/RelationGroupValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecElementWithUserDefinedAttributesValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecElementWithUserDefinedAttributesValidator.java
index 69c8c66..9a9b76c 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecElementWithUserDefinedAttributesValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecElementWithUserDefinedAttributesValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecGroupHierarchyRootValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecGroupHierarchyRootValidator.java
index a79aca3..d3f8cc9 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecGroupHierarchyRootValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecGroupHierarchyRootValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecGroupHierarchyValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecGroupHierarchyValidator.java
index f6b6927..3c5a52c 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecGroupHierarchyValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecGroupHierarchyValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecGroupValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecGroupValidator.java
index 2fee4e7..e854f1f 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecGroupValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecGroupValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecHierarchyRootValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecHierarchyRootValidator.java
index 0298d91..ad4d94e 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecHierarchyRootValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecHierarchyRootValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecHierarchyValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecHierarchyValidator.java
index 04f6bd6..bc76339 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecHierarchyValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecHierarchyValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecObjectValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecObjectValidator.java
index 0d02a27..e7e3e52 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecObjectValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecObjectValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecRelationValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecRelationValidator.java
index e46964e..69bcf60 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecRelationValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecRelationValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecTypeValidator.java b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecTypeValidator.java
index d82d66b..56f51a6 100644
--- a/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecTypeValidator.java
+++ b/org.eclipse.rmf.rif12.model/src/org/eclipse/rmf/rif12/ExchangeFile/validation/SpecTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.resource/META-INF/MANIFEST.MF b/org.eclipse.rmf.rif12.resource/META-INF/MANIFEST.MF
index a0678e7..bd78b7a 100644
--- a/org.eclipse.rmf.rif12.resource/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.rif12.resource/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.rif12.resource;singleton:=true

-Bundle-Version: 0.9.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",

  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",

  org.eclipse.rmf.rif12.model;bundle-version="0.1.0",

  org.eclipse.rmf.rif12.xsd.model;bundle-version="0.1.0",

  org.eclipse.rmf.emf.ecore.converter;bundle-version="0.1.0"

-Export-Package: org.eclipse.rmf.rif12.resource,

- org.eclipse.rmf.rif12.resource.extensions

+Export-Package: org.eclipse.rmf.rif12.resource,org.eclipse.rmf.rif12.r

+ esource.extensions

 Bundle-Vendor: %providerName

diff --git a/org.eclipse.rmf.rif12.resource/about.html b/org.eclipse.rmf.rif12.resource/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.rif12.resource/about.html
+++ b/org.eclipse.rmf.rif12.resource/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif12.resource/build.properties b/org.eclipse.rmf.rif12.resource/build.properties
index 72c85b8..12746dc 100644
--- a/org.eclipse.rmf.rif12.resource/build.properties
+++ b/org.eclipse.rmf.rif12.resource/build.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 itemis GmbH.

+###############################################################################

+# Copyright (c) 2011, 2014 itemis GmbH.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,9 +7,13 @@
 #

 # Contributors:

 #     Nirmal Sasidharan - initial API and implementation

+###############################################################################

 source.. = src/

 output.. = bin/

 bin.includes = META-INF/,\

                .,\

                plugin.xml,\

-               plugin.properties

+               plugin.properties,\

+               notice.html,\

+               epl-v10.html,\

+               about.html

diff --git a/org.eclipse.rmf.rif12.resource/epl-v10.html b/org.eclipse.rmf.rif12.resource/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.rif12.resource/epl-v10.html
+++ b/org.eclipse.rmf.rif12.resource/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif12.resource/notice.html b/org.eclipse.rmf.rif12.resource/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.rif12.resource/notice.html
+++ b/org.eclipse.rmf.rif12.resource/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.rif12.resource/plugin.properties b/org.eclipse.rmf.rif12.resource/plugin.properties
index 98c6295..40ab4b2 100644
--- a/org.eclipse.rmf.rif12.resource/plugin.properties
+++ b/org.eclipse.rmf.rif12.resource/plugin.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2011 itemis GmbH.

+###############################################################################

+# Copyright (c) 2011, 2012 itemis GmbH.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

 # which accompanies this distribution, and is available at

@@ -6,5 +7,6 @@
 #

 # Contributors:

 #     Nirmal Sasidharan - initial API and implementation

+###############################################################################

 pluginName = Rif12 Resource (Incubation)

 providerName = Eclipse Modeling Project

diff --git a/org.eclipse.rmf.rif12.resource/pom.xml b/org.eclipse.rmf.rif12.resource/pom.xml
index 97f7b86..0b1505c 100644
--- a/org.eclipse.rmf.rif12.resource/pom.xml
+++ b/org.eclipse.rmf.rif12.resource/pom.xml
@@ -6,31 +6,13 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.rif12.resource</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

 	<packaging>eclipse-plugin</packaging>

 	<groupId>org.eclipse.rmf.plugins</groupId>

- 	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.eclipse.tycho</groupId>

-				<artifactId>tycho-source-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<executions>

-					<execution>

-						<id>plugin-source</id>

-						<goals>

-							<goal>plugin-source</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/Rif12ResourceFactoryImpl.java b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/Rif12ResourceFactoryImpl.java
index 48c7f2a..a3364ba 100644
--- a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/Rif12ResourceFactoryImpl.java
+++ b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/Rif12ResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/Rif12ResourceImpl.java b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/Rif12ResourceImpl.java
index faf82cd..7ad109f 100644
--- a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/Rif12ResourceImpl.java
+++ b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/Rif12ResourceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/converters/Rif2XMLConverter.java b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/converters/Rif2XMLConverter.java
index 549386c..06ccd0c 100644
--- a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/converters/Rif2XMLConverter.java
+++ b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/converters/Rif2XMLConverter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/converters/XML2RifConverter.java b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/converters/XML2RifConverter.java
index 06299f3..db910da 100644
--- a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/converters/XML2RifConverter.java
+++ b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/converters/XML2RifConverter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/RifToolExtensionAny.java b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/RifToolExtensionAny.java
index f366b74..a6d9ae1 100644
--- a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/RifToolExtensionAny.java
+++ b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/RifToolExtensionAny.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/RifToolExtensionAnyImpl.java b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/RifToolExtensionAnyImpl.java
index 7eec1a8..8a8f48c 100644
--- a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/RifToolExtensionAnyImpl.java
+++ b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/RifToolExtensionAnyImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/RifToolExtensionConfiguration.java b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/RifToolExtensionConfiguration.java
index 92d2488..2d36a20 100644
--- a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/RifToolExtensionConfiguration.java
+++ b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/RifToolExtensionConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/XhtmlContentAny.java b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/XhtmlContentAny.java
index 9b8a91a..32c8970 100644
--- a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/XhtmlContentAny.java
+++ b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/XhtmlContentAny.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/XhtmlContentAnyImpl.java b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/XhtmlContentAnyImpl.java
index 833c30a..0995e11 100644
--- a/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/XhtmlContentAnyImpl.java
+++ b/org.eclipse.rmf.rif12.resource/src/org/eclipse/rmf/rif12/resource/extensions/XhtmlContentAnyImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/META-INF/MANIFEST.MF b/org.eclipse.rmf.rif12.xsd.model/META-INF/MANIFEST.MF
index cb21267..7bc5a00 100644
--- a/org.eclipse.rmf.rif12.xsd.model/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.rif12.xsd.model/META-INF/MANIFEST.MF
@@ -2,23 +2,17 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.rif12.xsd.model;singleton:=true

-Bundle-Version: 0.9.0.qualifier

+Bundle-Version: 0.10.0.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Export-Package: org.eclipse.rmf.rif12.its,

- org.eclipse.rmf.rif12.its.impl,

- org.eclipse.rmf.rif12.its.util,

- org.eclipse.rmf.rif12.xhtml,

- org.eclipse.rmf.rif12.xhtml.impl,

- org.eclipse.rmf.rif12.xhtml.util,

- org.eclipse.rmf.rif12.xlink,

- org.eclipse.rmf.rif12.xlink.impl,

- org.eclipse.rmf.rif12.xlink.util,

- org.eclipse.rmf.rif12.xsd,

- org.eclipse.rmf.rif12.xsd.impl,

- org.eclipse.rmf.rif12.xsd.util

+Export-Package: org.eclipse.rmf.rif12.its,org.eclipse.rmf.rif12.its.im

+ pl,org.eclipse.rmf.rif12.its.util,org.eclipse.rmf.rif12.xhtml,org.ecl

+ ipse.rmf.rif12.xhtml.impl,org.eclipse.rmf.rif12.xhtml.util,org.eclips

+ e.rmf.rif12.xlink,org.eclipse.rmf.rif12.xlink.impl,org.eclipse.rmf.ri

+ f12.xlink.util,org.eclipse.rmf.rif12.xsd,org.eclipse.rmf.rif12.xsd.im

+ pl,org.eclipse.rmf.rif12.xsd.util

 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",

  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,

  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)";visibility:=reexport

diff --git a/org.eclipse.rmf.rif12.xsd.model/about.html b/org.eclipse.rmf.rif12.xsd.model/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.rif12.xsd.model/about.html
+++ b/org.eclipse.rmf.rif12.xsd.model/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif12.xsd.model/build.properties b/org.eclipse.rmf.rif12.xsd.model/build.properties
index 79070dd..edb1e8b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/build.properties
+++ b/org.eclipse.rmf.rif12.xsd.model/build.properties
@@ -1,3 +1,4 @@
+###############################################################################

 # Copyright (c) 2011 itemis GmbH.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

@@ -6,11 +7,15 @@
 #

 # Contributors:

 #     Nirmal Sasidharan - initial API and implementation

+###############################################################################

 bin.includes = .,\

                model/,\

                META-INF/,\

                plugin.xml,\

-               plugin.properties

+               plugin.properties,\

+               about.html,\

+               epl-v10.html,\

+               notice.html

 jars.compile.order = .

 source.. = src/

 output.. = bin/

diff --git a/org.eclipse.rmf.rif12.xsd.model/epl-v10.html b/org.eclipse.rmf.rif12.xsd.model/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.rif12.xsd.model/epl-v10.html
+++ b/org.eclipse.rmf.rif12.xsd.model/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif12.xsd.model/notice.html b/org.eclipse.rmf.rif12.xsd.model/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.rif12.xsd.model/notice.html
+++ b/org.eclipse.rmf.rif12.xsd.model/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.rif12.xsd.model/plugin.properties b/org.eclipse.rmf.rif12.xsd.model/plugin.properties
index ae8ba79..e2ce84f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/plugin.properties
+++ b/org.eclipse.rmf.rif12.xsd.model/plugin.properties
@@ -1,3 +1,4 @@
+###############################################################################

 # Copyright (c) 2011 itemis GmbH.

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

@@ -6,5 +7,6 @@
 #

 # Contributors:

 #     Nirmal Sasidharan - initial API and implementation

+###############################################################################

 pluginName = Rif12 XSD Model (Incubation)

 providerName = Eclipse Modeling Project

diff --git a/org.eclipse.rmf.rif12.xsd.model/pom.xml b/org.eclipse.rmf.rif12.xsd.model/pom.xml
index 6338c57..cfb15dc 100644
--- a/org.eclipse.rmf.rif12.xsd.model/pom.xml
+++ b/org.eclipse.rmf.rif12.xsd.model/pom.xml
@@ -6,31 +6,13 @@
 	<parent>

 		<groupId>org.eclipse.rmf</groupId>

 		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

+		<version>0.10.0-SNAPSHOT</version>

 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

 	</parent>

 	<artifactId>org.eclipse.rmf.rif12.xsd.model</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

 	<properties>

     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

   	</properties>

 	<packaging>eclipse-plugin</packaging>

 	<groupId>org.eclipse.rmf.plugins</groupId>

- 	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.eclipse.tycho</groupId>

-				<artifactId>tycho-source-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<executions>

-					<execution>

-						<id>plugin-source</id>

-						<goals>

-							<goal>plugin-source</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DirRuleType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DirRuleType.java
index 66ae979..ad6de20 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DirRuleType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DirRuleType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DirType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DirType.java
index 5f2b659..e33129a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DirType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DirType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DirType1.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DirType1.java
index 7cf4484..360e716 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DirType1.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DirType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DirType2.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DirType2.java
index c22bb73..6a0c82d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DirType2.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DirType2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DocumentRoot.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DocumentRoot.java
index 2273c96..60acabf 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DocumentRoot.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/DocumentRoot.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsFactory.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsFactory.java
index aa9b3de..a30b6fd 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsFactory.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsLocNoteContent.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsLocNoteContent.java
index 8d2f555..2f7e393 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsLocNoteContent.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsLocNoteContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsLocNoteRuleContent.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsLocNoteRuleContent.java
index 81a0917..3243352 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsLocNoteRuleContent.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsLocNoteRuleContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsPackage.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsPackage.java
index 2461d50..230a4b9 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsPackage.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsPackage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRbContent.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRbContent.java
index 06ff2ec..386a597 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRbContent.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRbContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRbcContent.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRbcContent.java
index 28f5521..f1f67bd 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRbcContent.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRbcContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRtContent.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRtContent.java
index 0871faa..ffd6bae 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRtContent.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRtContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRtcContent.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRtcContent.java
index 0b3168b..363c3f6 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRtcContent.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRtcContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRubyContent.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRubyContent.java
index a5a938e..bfc0460 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRubyContent.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRubyContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRubyRuleContent.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRubyRuleContent.java
index 132c590..6b9dd55 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRubyRuleContent.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRubyRuleContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRulesContent.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRulesContent.java
index 49ee881..5bfe0e2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRulesContent.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsRulesContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsSpanContent.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsSpanContent.java
index 82f0337..798a0c3 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsSpanContent.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/ItsSpanContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LangRuleType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LangRuleType.java
index 184aab9..c9e9433 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LangRuleType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LangRuleType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LocNoteRuleType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LocNoteRuleType.java
index 2df25b5..8be1fe9 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LocNoteRuleType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LocNoteRuleType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LocNoteType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LocNoteType.java
index fc40327..8b93095 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LocNoteType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LocNoteType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LocNoteTypeType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LocNoteTypeType.java
index c9477c2..255fa03 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LocNoteTypeType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LocNoteTypeType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LocNoteTypeType1.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LocNoteTypeType1.java
index 0f0c5b2..5d11f40 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LocNoteTypeType1.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/LocNoteTypeType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RbType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RbType.java
index 46691e5..46d2349 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RbType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RbType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RbcType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RbcType.java
index efeff37..e8d6e07 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RbcType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RbcType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RpType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RpType.java
index ffa1ef0..3040f47 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RpType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RpType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RtType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RtType.java
index be15c67..f868d79 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RtType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RtType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RtcType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RtcType.java
index 888c79b..43a562b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RtcType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RtcType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RubyRuleType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RubyRuleType.java
index 3e5f366..345bdd6 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RubyRuleType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RubyRuleType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RubyTextType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RubyTextType.java
index 0f2d099..c0f0cdf 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RubyTextType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RubyTextType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RubyType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RubyType.java
index 700c391..faeb5ff 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RubyType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RubyType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RulesType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RulesType.java
index d8bbdc7..09271ba 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RulesType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/RulesType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/SpanType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/SpanType.java
index 0ae8b37..ce16819 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/SpanType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/SpanType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TermRuleType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TermRuleType.java
index b767ff4..70df200 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TermRuleType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TermRuleType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TermType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TermType.java
index 18f1d43..593c8b5 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TermType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TermType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TermType1.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TermType1.java
index be89098..874200f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TermType1.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TermType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TranslateRuleType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TranslateRuleType.java
index a19a88b..6c869f2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TranslateRuleType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TranslateRuleType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TranslateType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TranslateType.java
index 2f6a8e3..bc3e648 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TranslateType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TranslateType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TranslateType1.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TranslateType1.java
index 15c6a1c..029d87e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TranslateType1.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/TranslateType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/WithinTextRuleType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/WithinTextRuleType.java
index 32fc7d5..31bdc30 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/WithinTextRuleType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/WithinTextRuleType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/WithinTextType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/WithinTextType.java
index 1d79d08..fc5ae75 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/WithinTextType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/WithinTextType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/DirRuleTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/DirRuleTypeImpl.java
index 7144250..557bd8a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/DirRuleTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/DirRuleTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/DocumentRootImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/DocumentRootImpl.java
index a9e6b36..a800bff 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/DocumentRootImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/DocumentRootImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsFactoryImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsFactoryImpl.java
index aabbfb9..e2893cc 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsFactoryImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsLocNoteContentImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsLocNoteContentImpl.java
index 674a570..d4b6e5e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsLocNoteContentImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsLocNoteContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsLocNoteRuleContentImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsLocNoteRuleContentImpl.java
index b15b998..35b3d0f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsLocNoteRuleContentImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsLocNoteRuleContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsPackageImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsPackageImpl.java
index 244f198..aded807 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsPackageImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsPackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRbContentImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRbContentImpl.java
index e3be6b9..3c091b2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRbContentImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRbContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRbcContentImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRbcContentImpl.java
index 939d52b..2a38552 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRbcContentImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRbcContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRtContentImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRtContentImpl.java
index 7d4cdda..cc5d371 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRtContentImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRtContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRtcContentImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRtcContentImpl.java
index 7f54fe9..b452ac3 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRtcContentImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRtcContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRubyContentImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRubyContentImpl.java
index 878bf98..ad783be 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRubyContentImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRubyContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRubyRuleContentImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRubyRuleContentImpl.java
index 33d5f0b..3ab3336 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRubyRuleContentImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRubyRuleContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRulesContentImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRulesContentImpl.java
index 5df83f8..b8a812e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRulesContentImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsRulesContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsSpanContentImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsSpanContentImpl.java
index 7f9f674..0d29a4c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsSpanContentImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/ItsSpanContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/LangRuleTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/LangRuleTypeImpl.java
index fc2c3c3..b244101 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/LangRuleTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/LangRuleTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/LocNoteRuleTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/LocNoteRuleTypeImpl.java
index c24f00c..35a956b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/LocNoteRuleTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/LocNoteRuleTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/LocNoteTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/LocNoteTypeImpl.java
index cf3ac85..684f279 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/LocNoteTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/LocNoteTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RbTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RbTypeImpl.java
index 44834d8..7d02072 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RbTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RbTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RbcTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RbcTypeImpl.java
index 9d9b10f..0b36e8b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RbcTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RbcTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RpTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RpTypeImpl.java
index 94d7080..e098f36 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RpTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RpTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RtTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RtTypeImpl.java
index caafe74..36ff8c9 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RtTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RtTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RtcTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RtcTypeImpl.java
index 1700495..67d2b90 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RtcTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RtcTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RubyRuleTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RubyRuleTypeImpl.java
index 3faca9d..47bc3e5 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RubyRuleTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RubyRuleTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RubyTextTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RubyTextTypeImpl.java
index 1eed5d3..aade05a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RubyTextTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RubyTextTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RubyTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RubyTypeImpl.java
index 577934e..71c1ebc 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RubyTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RubyTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RulesTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RulesTypeImpl.java
index 19405ec..3a4b61c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RulesTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/RulesTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/SpanTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/SpanTypeImpl.java
index 3e5fe22..5739b1d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/SpanTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/SpanTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/TermRuleTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/TermRuleTypeImpl.java
index d646c30..459d012 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/TermRuleTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/TermRuleTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/TranslateRuleTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/TranslateRuleTypeImpl.java
index 9e8c3e2..234cfdf 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/TranslateRuleTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/TranslateRuleTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/WithinTextRuleTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/WithinTextRuleTypeImpl.java
index 26d3421..f7c4cbd 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/WithinTextRuleTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/impl/WithinTextRuleTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsAdapterFactory.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsAdapterFactory.java
index cbb101c..d2fafd2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsAdapterFactory.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsResourceFactoryImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsResourceFactoryImpl.java
index f12f3ba..7bd233b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsResourceFactoryImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsResourceImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsResourceImpl.java
index 5a1f39f..07f0ca6 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsResourceImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsResourceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsSwitch.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsSwitch.java
index 395b019..f8eca0b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsSwitch.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsSwitch.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsXMLProcessor.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsXMLProcessor.java
index 90124a4..d52782c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsXMLProcessor.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/util/ItsXMLProcessor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/DirRuleTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/DirRuleTypeValidator.java
index 4331437..dd43525 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/DirRuleTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/DirRuleTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/DocumentRootValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/DocumentRootValidator.java
index 9d51381..413aba7 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/DocumentRootValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/DocumentRootValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsLocNoteContentValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsLocNoteContentValidator.java
index 34cbc62..433682b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsLocNoteContentValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsLocNoteContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsLocNoteRuleContentValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsLocNoteRuleContentValidator.java
index 3f1b469..0e06369 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsLocNoteRuleContentValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsLocNoteRuleContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRbContentValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRbContentValidator.java
index cb11045..edfe79a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRbContentValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRbContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRbcContentValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRbcContentValidator.java
index f735127..41c2cc3 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRbcContentValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRbcContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRtContentValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRtContentValidator.java
index fd056a8..1d628f0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRtContentValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRtContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRtcContentValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRtcContentValidator.java
index 6e6db0c..f892558 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRtcContentValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRtcContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRubyContentValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRubyContentValidator.java
index 5b638f3..ada3dc7 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRubyContentValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRubyContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRubyRuleContentValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRubyRuleContentValidator.java
index 3124c43..8955684 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRubyRuleContentValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRubyRuleContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRulesContentValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRulesContentValidator.java
index 9465db1..a93b068 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRulesContentValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsRulesContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsSpanContentValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsSpanContentValidator.java
index 855d1e8..94f621d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsSpanContentValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/ItsSpanContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/LangRuleTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/LangRuleTypeValidator.java
index f9cf615..805ea13 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/LangRuleTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/LangRuleTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/LocNoteRuleTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/LocNoteRuleTypeValidator.java
index 649687e..f4ef0dd 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/LocNoteRuleTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/LocNoteRuleTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/LocNoteTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/LocNoteTypeValidator.java
index 9c86d20..7a1254a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/LocNoteTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/LocNoteTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RbTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RbTypeValidator.java
index 51cdd9a..d0e5ab5 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RbTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RbTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RbcTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RbcTypeValidator.java
index 2555488..bebf273 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RbcTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RbcTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RpTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RpTypeValidator.java
index d55c323..13de961 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RpTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RpTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RtTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RtTypeValidator.java
index 1037832..798a449 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RtTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RtTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RtcTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RtcTypeValidator.java
index bb77cb3..33dc9a9 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RtcTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RtcTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RubyRuleTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RubyRuleTypeValidator.java
index 2ff5a01..93d1966 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RubyRuleTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RubyRuleTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RubyTextTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RubyTextTypeValidator.java
index f7864c4..5bb841a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RubyTextTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RubyTextTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RubyTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RubyTypeValidator.java
index 660f7d7..4f42c4b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RubyTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RubyTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RulesTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RulesTypeValidator.java
index 8ba0296..44e0c49 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RulesTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/RulesTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/SpanTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/SpanTypeValidator.java
index ffc1cfd..1acd266 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/SpanTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/SpanTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/TermRuleTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/TermRuleTypeValidator.java
index ce2096e..55e58b0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/TermRuleTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/TermRuleTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/TranslateRuleTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/TranslateRuleTypeValidator.java
index ec7aaee..21d4310 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/TranslateRuleTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/TranslateRuleTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/WithinTextRuleTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/WithinTextRuleTypeValidator.java
index cb771da..ffc20b1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/WithinTextRuleTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/its/validation/WithinTextRuleTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AContent.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AContent.java
index ebe0f32..9f8286b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AContent.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AType.java
index 7993486..f617593 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AbbrType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AbbrType.java
index fe9d251..dfab6c4 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AbbrType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AbbrType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AcronymType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AcronymType.java
index 541660b..de9e9f5 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AcronymType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AcronymType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AddressType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AddressType.java
index 4504b05..fc2231f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AddressType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AddressType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AlignType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AlignType.java
index d657592..1864e04 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AlignType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/AlignType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BType.java
index 6863177..21dc517 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BigType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BigType.java
index 84bf708..2844343 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BigType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BigType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Block.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Block.java
index 6d33896..4965b39 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Block.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Block.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BlockquoteType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BlockquoteType.java
index e82c6e7..7aaf11a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BlockquoteType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BlockquoteType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BodyType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BodyType.java
index bc8ac29..5cb463b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BodyType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BodyType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BrType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BrType.java
index 5328e15..7485c34 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BrType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/BrType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/CaptionType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/CaptionType.java
index 1424104..e2ea332 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/CaptionType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/CaptionType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/CiteType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/CiteType.java
index 980a4c7..0e18e7e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/CiteType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/CiteType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/CodeType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/CodeType.java
index 39c4d47..1e98cbb 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/CodeType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/CodeType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ColType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ColType.java
index a560b30..db41a93 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ColType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ColType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ColgroupType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ColgroupType.java
index 218ffe3..b9bc639 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ColgroupType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ColgroupType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DdType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DdType.java
index c2097ec..3dbfaf5 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DdType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DdType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DeclareType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DeclareType.java
index ad9801c..5e260e9 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DeclareType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DeclareType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DelType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DelType.java
index f881fab..2b050ff 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DelType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DelType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DfnType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DfnType.java
index dde4474..abeb240 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DfnType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DfnType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DivType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DivType.java
index af00ce3..035b38d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DivType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DivType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DlType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DlType.java
index 0ef0561..0d459d4 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DlType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DlType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DocumentRoot.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DocumentRoot.java
index dbd45f3..c18eaed 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DocumentRoot.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DocumentRoot.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DtType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DtType.java
index 0d88d10..1f0c46c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DtType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/DtType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/EmType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/EmType.java
index 4bb318d..89ba112 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/EmType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/EmType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Flow.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Flow.java
index f7ff652..f2aec73 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Flow.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Flow.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/FormContent.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/FormContent.java
index a9b9c2b..a8d3780 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/FormContent.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/FormContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H1Type.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H1Type.java
index c6f3c4c..9d67ee5 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H1Type.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H1Type.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H2Type.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H2Type.java
index 4c00af5..23f4454 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H2Type.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H2Type.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H3Type.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H3Type.java
index 857f0e9..53c91ac 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H3Type.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H3Type.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H4Type.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H4Type.java
index fc2dbfa..1f0d431 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H4Type.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H4Type.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H5Type.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H5Type.java
index c84f1ce..5b4ffc8 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H5Type.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H5Type.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H6Type.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H6Type.java
index 5b3a89e..1b59cce 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H6Type.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/H6Type.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/HrType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/HrType.java
index b1a7ee6..048aee3 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/HrType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/HrType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/HtmlType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/HtmlType.java
index 84cbf15..9d964b9 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/HtmlType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/HtmlType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/IType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/IType.java
index f084e86..81165ce 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/IType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/IType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ImgType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ImgType.java
index 0a9d60b..45bbf91 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ImgType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ImgType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Inline.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Inline.java
index f41ab60..44ea3a2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Inline.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Inline.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/InsType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/InsType.java
index 45fe2f1..aa3dc0a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/InsType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/InsType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/IsmapType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/IsmapType.java
index edca7f7..5e46d11 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/IsmapType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/IsmapType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/KbdType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/KbdType.java
index 319b3f0..dade529 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/KbdType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/KbdType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/LiType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/LiType.java
index 36e5055..4cb2144 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/LiType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/LiType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ObjectType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ObjectType.java
index 0758c49..840c2b3 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ObjectType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ObjectType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/OlType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/OlType.java
index 6a3f808..dc17a14 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/OlType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/OlType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/PType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/PType.java
index 329be46..1db9153 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/PType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/PType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ParamType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ParamType.java
index f671489..6ef2045 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ParamType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ParamType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/PreContent.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/PreContent.java
index bc46c08..dbb7686 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/PreContent.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/PreContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/PreType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/PreType.java
index 44c9224..bdab0e3 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/PreType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/PreType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/QType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/QType.java
index 2f90080..47885d1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/QType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/QType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SampType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SampType.java
index 6db57d1..be42388 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SampType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SampType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Scope.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Scope.java
index efd1199..3f48489 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Scope.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Scope.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Shape.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Shape.java
index d3cb1a1..bb73281 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Shape.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/Shape.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SmallType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SmallType.java
index 380f400..70ce0e2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SmallType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SmallType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SpanType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SpanType.java
index c40baef..4a02248 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SpanType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SpanType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/StrikeType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/StrikeType.java
index a068513..6e51566 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/StrikeType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/StrikeType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/StrongType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/StrongType.java
index 51b3d27..2510392 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/StrongType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/StrongType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SubType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SubType.java
index 4a14ee4..a1979bd 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SubType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SubType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SupType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SupType.java
index 76ee734..0e95b35 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SupType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/SupType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TableType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TableType.java
index a9ed5f7..e90eb08 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TableType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TableType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TbodyType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TbodyType.java
index 94f25d9..1831692 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TbodyType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TbodyType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TdType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TdType.java
index 1b74333..6776530 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TdType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TdType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TfootType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TfootType.java
index 8d5166a..72c4c41 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TfootType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TfootType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ThType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ThType.java
index 1f23559..035e3b5 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ThType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ThType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TheadType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TheadType.java
index b73b2f9..fc433f6 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TheadType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TheadType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TrType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TrType.java
index a915b51..86231c0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TrType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TrType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TtType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TtType.java
index 70d7193..e720394 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TtType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/TtType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/UType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/UType.java
index e3d54bf..a77a621 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/UType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/UType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/UlType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/UlType.java
index 5c22f2a..dd30dc5 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/UlType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/UlType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ValignType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ValignType.java
index 07ab23f..48b30c8 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ValignType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ValignType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ValuetypeType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ValuetypeType.java
index f00570b..5beff10 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ValuetypeType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/ValuetypeType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/VarType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/VarType.java
index f9f1ac0..20b68b7 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/VarType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/VarType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/XhtmlFactory.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/XhtmlFactory.java
index f747e50..c577c32 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/XhtmlFactory.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/XhtmlFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/XhtmlPackage.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/XhtmlPackage.java
index 9751cd8..213a1f4 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/XhtmlPackage.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/XhtmlPackage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/AContentImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/AContentImpl.java
index 3690d4b..8eab8c6 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/AContentImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/AContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ATypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ATypeImpl.java
index 913b444..0a21f6e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ATypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ATypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/AbbrTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/AbbrTypeImpl.java
index b210836..d99036e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/AbbrTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/AbbrTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/AcronymTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/AcronymTypeImpl.java
index d86f91c..eba26b4 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/AcronymTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/AcronymTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/AddressTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/AddressTypeImpl.java
index ced7d1f..9a62b58 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/AddressTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/AddressTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BTypeImpl.java
index 4aa50f5..31f8c6c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BigTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BigTypeImpl.java
index 8b5a9c2..831652f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BigTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BigTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BlockImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BlockImpl.java
index 2179fcd..e1549b6 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BlockImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BlockImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BlockquoteTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BlockquoteTypeImpl.java
index 85533e0..55f6815 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BlockquoteTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BlockquoteTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BodyTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BodyTypeImpl.java
index 7e87f3b..dfe8cce 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BodyTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BodyTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BrTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BrTypeImpl.java
index 5a74c06..f75d5a0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BrTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/BrTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/CaptionTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/CaptionTypeImpl.java
index 5581a3e..6d9c63a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/CaptionTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/CaptionTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/CiteTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/CiteTypeImpl.java
index aec7ca4..bbe86ea 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/CiteTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/CiteTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/CodeTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/CodeTypeImpl.java
index 766af56..7425a0b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/CodeTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/CodeTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ColTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ColTypeImpl.java
index abc0eb1..d3bcfda 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ColTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ColTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ColgroupTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ColgroupTypeImpl.java
index 4d0d30a..09550f2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ColgroupTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ColgroupTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DdTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DdTypeImpl.java
index 51bdd34..ff85731 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DdTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DdTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DelTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DelTypeImpl.java
index cfba8f2..8075307 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DelTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DelTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DfnTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DfnTypeImpl.java
index f141ea6..4f6f9b2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DfnTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DfnTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DivTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DivTypeImpl.java
index e682787..46bfc6d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DivTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DivTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DlTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DlTypeImpl.java
index e7dd0da..8e1a023 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DlTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DlTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DocumentRootImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DocumentRootImpl.java
index 381edd0..1997a21 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DocumentRootImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DocumentRootImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DtTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DtTypeImpl.java
index 75c0a09..a0cf0d7 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DtTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/DtTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/EmTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/EmTypeImpl.java
index 2dd2c35..ac4bbc1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/EmTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/EmTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/FlowImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/FlowImpl.java
index fe59f9c..2b5dc52 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/FlowImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/FlowImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/FormContentImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/FormContentImpl.java
index a60c17c..a934522 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/FormContentImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/FormContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H1TypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H1TypeImpl.java
index b3a3d49..3c842ca 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H1TypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H1TypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H2TypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H2TypeImpl.java
index 4913fce..c3b9d24 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H2TypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H2TypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H3TypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H3TypeImpl.java
index e53ab6e..17aec5e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H3TypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H3TypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H4TypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H4TypeImpl.java
index fdc479a..5487f32 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H4TypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H4TypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H5TypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H5TypeImpl.java
index 4c10d21..be11516 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H5TypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H5TypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H6TypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H6TypeImpl.java
index f564df1..f983b12 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H6TypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/H6TypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/HrTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/HrTypeImpl.java
index 1cb5342..0b98c79 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/HrTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/HrTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/HtmlTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/HtmlTypeImpl.java
index b5314e9..96ee63f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/HtmlTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/HtmlTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ITypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ITypeImpl.java
index b186a43..d7d805c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ITypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ITypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ImgTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ImgTypeImpl.java
index c85dc0c..3e94f9d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ImgTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ImgTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/InlineImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/InlineImpl.java
index a7b1e02..929ce3d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/InlineImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/InlineImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/InsTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/InsTypeImpl.java
index 71a0b5c..93fc324 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/InsTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/InsTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/KbdTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/KbdTypeImpl.java
index 3c1fb09..78eb37c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/KbdTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/KbdTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/LiTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/LiTypeImpl.java
index 4566ccf..fc9cb38 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/LiTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/LiTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ObjectTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ObjectTypeImpl.java
index 6f9b93b..ade6ef7 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ObjectTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ObjectTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/OlTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/OlTypeImpl.java
index 7f9f962..166e552 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/OlTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/OlTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/PTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/PTypeImpl.java
index c32c9f6..43f6ded 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/PTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/PTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ParamTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ParamTypeImpl.java
index e9a46fe..8352084 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ParamTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ParamTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/PreContentImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/PreContentImpl.java
index 473f1bf..ede8be4 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/PreContentImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/PreContentImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/PreTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/PreTypeImpl.java
index 7b7deb2..5df4207 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/PreTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/PreTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/QTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/QTypeImpl.java
index 949e9cd..1b18a5d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/QTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/QTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SampTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SampTypeImpl.java
index abd0b1f..01bea69 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SampTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SampTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SmallTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SmallTypeImpl.java
index ea3306c..207f3b5 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SmallTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SmallTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SpanTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SpanTypeImpl.java
index 45bf14c..0e0e4dc 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SpanTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SpanTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/StrikeTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/StrikeTypeImpl.java
index 4fc52b5..a963ecc 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/StrikeTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/StrikeTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/StrongTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/StrongTypeImpl.java
index d5e53c8..7228d2d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/StrongTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/StrongTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SubTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SubTypeImpl.java
index 01afb6b..c08edcc 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SubTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SubTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SupTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SupTypeImpl.java
index 1852dfc..3e3f550 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SupTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/SupTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TableTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TableTypeImpl.java
index fb4c65c..0e55b20 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TableTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TableTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TbodyTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TbodyTypeImpl.java
index 8efafee..9081573 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TbodyTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TbodyTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TdTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TdTypeImpl.java
index 0d56877..a10478d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TdTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TdTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TfootTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TfootTypeImpl.java
index 4ce7205..3846ec7 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TfootTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TfootTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ThTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ThTypeImpl.java
index 4b33c82..2ffdd7d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ThTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/ThTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TheadTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TheadTypeImpl.java
index 5e5b1d7..5580cb5 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TheadTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TheadTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TrTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TrTypeImpl.java
index 1c5067c..87a9792 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TrTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TrTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TtTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TtTypeImpl.java
index bb7f220..eefd79c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TtTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/TtTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/UTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/UTypeImpl.java
index 0987fb7..3f8fcad 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/UTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/UTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/UlTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/UlTypeImpl.java
index 16d3f41..ae94ef0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/UlTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/UlTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/VarTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/VarTypeImpl.java
index 44453e0..c0e4ea9 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/VarTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/VarTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/XhtmlFactoryImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/XhtmlFactoryImpl.java
index a353251..2536a23 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/XhtmlFactoryImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/XhtmlFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/XhtmlPackageImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/XhtmlPackageImpl.java
index 5a6eaab..c4b1586 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/XhtmlPackageImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/impl/XhtmlPackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlAdapterFactory.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlAdapterFactory.java
index b734d48..ef00c34 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlAdapterFactory.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlResourceFactoryImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlResourceFactoryImpl.java
index 96eabc8..48c8d8b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlResourceFactoryImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlResourceImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlResourceImpl.java
index 482e88b..dcdb173 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlResourceImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlResourceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlSwitch.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlSwitch.java
index 27bd17c..c8a15c1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlSwitch.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlSwitch.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlValidator.java
index ab977eb..7e493a3 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlXMLProcessor.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlXMLProcessor.java
index c71a52b..bd60a60 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlXMLProcessor.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/util/XhtmlXMLProcessor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/AContentValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/AContentValidator.java
index aa7da0a..3204d18 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/AContentValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/AContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ATypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ATypeValidator.java
index 5f19247..8dde529 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ATypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ATypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/AbbrTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/AbbrTypeValidator.java
index e36b233..4db4f6d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/AbbrTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/AbbrTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/AcronymTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/AcronymTypeValidator.java
index 20d4f89..300b482 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/AcronymTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/AcronymTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/AddressTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/AddressTypeValidator.java
index c7cbf7d..39a7504 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/AddressTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/AddressTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BTypeValidator.java
index 6f11e31..148775f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BigTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BigTypeValidator.java
index 69ead71..6cd341b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BigTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BigTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BlockValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BlockValidator.java
index fee7b6d..185018b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BlockValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BlockValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BlockquoteTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BlockquoteTypeValidator.java
index 4de7ad1..9d68b37 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BlockquoteTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BlockquoteTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BodyTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BodyTypeValidator.java
index 8e4dbe0..13bafa7 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BodyTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BodyTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BrTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BrTypeValidator.java
index 1b7a217..d404d78 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BrTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/BrTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/CaptionTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/CaptionTypeValidator.java
index eb6f8fd..8ed848e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/CaptionTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/CaptionTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/CiteTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/CiteTypeValidator.java
index 666d236..88c2041 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/CiteTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/CiteTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/CodeTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/CodeTypeValidator.java
index b51252f..5411caf 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/CodeTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/CodeTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ColTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ColTypeValidator.java
index 32df815..376840a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ColTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ColTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ColgroupTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ColgroupTypeValidator.java
index 3e16b18..89d3242 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ColgroupTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ColgroupTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DdTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DdTypeValidator.java
index 2624d4a..3714740 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DdTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DdTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DelTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DelTypeValidator.java
index 0873590..448a4b4 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DelTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DelTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DfnTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DfnTypeValidator.java
index ad4f3fd..bd5096a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DfnTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DfnTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DivTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DivTypeValidator.java
index 65ebc85..3637cef 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DivTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DivTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DlTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DlTypeValidator.java
index 84a6dce..03adb5a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DlTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DlTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DocumentRootValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DocumentRootValidator.java
index 81d329b..036409c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DocumentRootValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DocumentRootValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DtTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DtTypeValidator.java
index e30e0f0..288fbd0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DtTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/DtTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/EmTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/EmTypeValidator.java
index 9cb38ac..5efcec0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/EmTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/EmTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/FlowValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/FlowValidator.java
index 8d6d024..526bb50 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/FlowValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/FlowValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/FormContentValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/FormContentValidator.java
index 76cb2db..ce903ea 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/FormContentValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/FormContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H1TypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H1TypeValidator.java
index eab847d..bc4b72f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H1TypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H1TypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H2TypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H2TypeValidator.java
index 6566b80..d07db18 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H2TypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H2TypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H3TypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H3TypeValidator.java
index 10523d8..9021369 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H3TypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H3TypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H4TypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H4TypeValidator.java
index 826201c..50ad22f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H4TypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H4TypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H5TypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H5TypeValidator.java
index 2388211..6bfa7e1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H5TypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H5TypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H6TypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H6TypeValidator.java
index 567df80..262a43b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H6TypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/H6TypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/HrTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/HrTypeValidator.java
index d2df237..a4ac61a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/HrTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/HrTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/HtmlTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/HtmlTypeValidator.java
index bac9681..ca9af5d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/HtmlTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/HtmlTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ITypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ITypeValidator.java
index 158ce2a..9a3afee 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ITypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ITypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ImgTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ImgTypeValidator.java
index d827644..4fcb351 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ImgTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ImgTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/InlineValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/InlineValidator.java
index 1cf988e..67a09d4 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/InlineValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/InlineValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/InsTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/InsTypeValidator.java
index 3acf93f..25ae6ba 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/InsTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/InsTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/KbdTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/KbdTypeValidator.java
index 110f9fc..978502c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/KbdTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/KbdTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/LiTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/LiTypeValidator.java
index 4ba9312..dd5928d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/LiTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/LiTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ObjectTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ObjectTypeValidator.java
index 991ad2d..07a5640 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ObjectTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ObjectTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/OlTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/OlTypeValidator.java
index a39f703..ad99e8f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/OlTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/OlTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/PTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/PTypeValidator.java
index 06a6a7d..781abd3 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/PTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/PTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ParamTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ParamTypeValidator.java
index f9bd068..3168829 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ParamTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ParamTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/PreContentValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/PreContentValidator.java
index bd0027c..9e29f72 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/PreContentValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/PreContentValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/PreTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/PreTypeValidator.java
index 200e2a0..f057762 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/PreTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/PreTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/QTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/QTypeValidator.java
index 631bf8f..d3fe1f8 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/QTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/QTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SampTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SampTypeValidator.java
index e5bc8be..c3951e2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SampTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SampTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SmallTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SmallTypeValidator.java
index 32c902a..ba6185c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SmallTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SmallTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SpanTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SpanTypeValidator.java
index fde8c1a..c4e991a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SpanTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SpanTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/StrikeTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/StrikeTypeValidator.java
index d0a5a6e..9359503 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/StrikeTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/StrikeTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/StrongTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/StrongTypeValidator.java
index 4141e25..7bc08b8 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/StrongTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/StrongTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SubTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SubTypeValidator.java
index 483a845..224a0dd 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SubTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SubTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SupTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SupTypeValidator.java
index b01d8e5..a62504e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SupTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/SupTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TableTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TableTypeValidator.java
index 157cd1d..fa3ffc8 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TableTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TableTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TbodyTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TbodyTypeValidator.java
index 39ca7fc..5c4a2c8 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TbodyTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TbodyTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TdTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TdTypeValidator.java
index 855cdb4..b0e8797 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TdTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TdTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TfootTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TfootTypeValidator.java
index 6434b68..6f800a0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TfootTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TfootTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ThTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ThTypeValidator.java
index dcd814f..ec36536 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ThTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/ThTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TheadTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TheadTypeValidator.java
index 4395c29..1489b35 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TheadTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TheadTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TrTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TrTypeValidator.java
index 397a770..80b681b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TrTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TrTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TtTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TtTypeValidator.java
index 8c86bd8..f051daa 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TtTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/TtTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/UTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/UTypeValidator.java
index 8d49486..7076a77 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/UTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/UTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/UlTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/UlTypeValidator.java
index 7ccb2c0..83655be 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/UlTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/UlTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/VarTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/VarTypeValidator.java
index e214867..c8353e9 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/VarTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xhtml/validation/VarTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/DocumentRoot.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/DocumentRoot.java
index c994874..55ac9a3 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/DocumentRoot.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/DocumentRoot.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/TypeType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/TypeType.java
index 98e86c3..7d7b58a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/TypeType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/TypeType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/XlinkFactory.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/XlinkFactory.java
index 131d143..850acab 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/XlinkFactory.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/XlinkFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/XlinkPackage.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/XlinkPackage.java
index 366d3e7..a6a4a77 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/XlinkPackage.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/XlinkPackage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/impl/DocumentRootImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/impl/DocumentRootImpl.java
index d042572..44eb3ee 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/impl/DocumentRootImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/impl/DocumentRootImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/impl/XlinkFactoryImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/impl/XlinkFactoryImpl.java
index 5d3b0af..a8a3615 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/impl/XlinkFactoryImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/impl/XlinkFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/impl/XlinkPackageImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/impl/XlinkPackageImpl.java
index 4065070..b95301e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/impl/XlinkPackageImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/impl/XlinkPackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkAdapterFactory.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkAdapterFactory.java
index dbca92b..7432d8c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkAdapterFactory.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkResourceFactoryImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkResourceFactoryImpl.java
index 6924b86..c2933ea 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkResourceFactoryImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkResourceImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkResourceImpl.java
index 8a9ecb8..d6ae26a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkResourceImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkResourceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkSwitch.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkSwitch.java
index 2c51b30..6f6a914 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkSwitch.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkSwitch.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkXMLProcessor.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkXMLProcessor.java
index f763019..2b1b838 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkXMLProcessor.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/util/XlinkXMLProcessor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/validation/DocumentRootValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/validation/DocumentRootValidator.java
index 5fe7e36..bb6eba0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/validation/DocumentRootValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xlink/validation/DocumentRootValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ACCESSPOLICIESType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ACCESSPOLICIESType.java
index f132b65..6ab4303 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ACCESSPOLICIESType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ACCESSPOLICIESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ACCESSPOLICY.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ACCESSPOLICY.java
index 71b205a..9db0f99 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ACCESSPOLICY.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ACCESSPOLICY.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ACCESSPOLICYACCESSMODEENUM.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ACCESSPOLICYACCESSMODEENUM.java
index dad82a3..81696f1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ACCESSPOLICYACCESSMODEENUM.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ACCESSPOLICYACCESSMODEENUM.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEDEFINITIONCOMPLEX.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEDEFINITIONCOMPLEX.java
index 6e7705c..2783a74 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEDEFINITIONCOMPLEX.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEDEFINITIONCOMPLEX.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEDEFINITIONENUMERATION.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEDEFINITIONENUMERATION.java
index 53345b7..edda02e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEDEFINITIONENUMERATION.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEDEFINITIONENUMERATION.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEDEFINITIONSIMPLE.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEDEFINITIONSIMPLE.java
index e0f68db..703ce55 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEDEFINITIONSIMPLE.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEDEFINITIONSIMPLE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEDEFINITIONSType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEDEFINITIONSType.java
index 5b5a749..6f954d8 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEDEFINITIONSType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEDEFINITIONSType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEEMBEDDEDDOCUMENT.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEEMBEDDEDDOCUMENT.java
index 16a6ebc..28cf06f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEEMBEDDEDDOCUMENT.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEEMBEDDEDDOCUMENT.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEEMBEDDEDFILE.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEEMBEDDEDFILE.java
index 4bc60c2..878a4e7 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEEMBEDDEDFILE.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEEMBEDDEDFILE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEENUMERATION.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEENUMERATION.java
index 7dcae8d..2efd65e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEENUMERATION.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEENUMERATION.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEFILEREFERENCE.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEFILEREFERENCE.java
index c7443ed..1642375 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEFILEREFERENCE.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEFILEREFERENCE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUESIMPLE.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUESIMPLE.java
index e012799..a24bcc4 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUESIMPLE.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUESIMPLE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUESType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUESType.java
index 755847e..3cd092f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUESType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEXMLDATA.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEXMLDATA.java
index 668ea69..1497a1a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEXMLDATA.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ATTRIBUTEVALUEXMLDATA.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/BINARYCONTENT.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/BINARYCONTENT.java
index 956b1e8..8bc45c0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/BINARYCONTENT.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/BINARYCONTENT.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CHILDRENType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CHILDRENType.java
index ccd8d6a..9497f2b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CHILDRENType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CHILDRENType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CHILDRENType1.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CHILDRENType1.java
index 58e6c8c..e171399 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CHILDRENType1.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CHILDRENType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CHILDRENType2.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CHILDRENType2.java
index 5124455..a9e6822 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CHILDRENType2.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CHILDRENType2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CHILDRENType3.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CHILDRENType3.java
index de2934c..d3041c6 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CHILDRENType3.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CHILDRENType3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CORECONTENTType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CORECONTENTType.java
index 2ccf198..6d9b2c0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CORECONTENTType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/CORECONTENTType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONBINARYFILE.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONBINARYFILE.java
index 1df75d3..2c64e68 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONBINARYFILE.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONBINARYFILE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONBOOLEAN.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONBOOLEAN.java
index 5c6e6af..ad8bc41 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONBOOLEAN.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONBOOLEAN.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONDATE.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONDATE.java
index 584da89..c9af2b1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONDATE.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONDATE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONDATEFORMATENUM.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONDATEFORMATENUM.java
index 44994a3..2808149 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONDATEFORMATENUM.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONDATEFORMATENUM.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONDOCUMENT.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONDOCUMENT.java
index fcd86b5..75634f9 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONDOCUMENT.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONDOCUMENT.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONENUMERATION.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONENUMERATION.java
index ae37064..ad609a6 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONENUMERATION.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONENUMERATION.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONINTEGER.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONINTEGER.java
index dbf87bb..73a4899 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONINTEGER.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONINTEGER.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONREAL.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONREAL.java
index 03f9636..f72fdb6 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONREAL.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONREAL.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONSTRING.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONSTRING.java
index 99e94cc..1ae58f7 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONSTRING.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONSTRING.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONSType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONSType.java
index d20966b..8746e1a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONSType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONSType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONXMLDATA.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONXMLDATA.java
index 163233a..3f0bf16 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONXMLDATA.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPEDEFINITIONXMLDATA.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPESType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPESType.java
index 4dccf1f..ae632a4 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPESType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DATATYPESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFAULTVALUEType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFAULTVALUEType.java
index 1f0a6af..7949943 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFAULTVALUEType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFAULTVALUEType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFAULTVALUEType1.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFAULTVALUEType1.java
index 18b852c..b1812e6 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFAULTVALUEType1.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFAULTVALUEType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFAULTVALUEType2.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFAULTVALUEType2.java
index 5c08560..52033a3 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFAULTVALUEType2.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFAULTVALUEType2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType.java
index 24fb04b..8228e0a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType1.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType1.java
index 00f1fa8..1f470a9 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType1.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType2.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType2.java
index c34cd25..46493e0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType2.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType3.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType3.java
index 6a6c6ab..86d450c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType3.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType4.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType4.java
index dd5a18a..089a413 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType4.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType4.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType5.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType5.java
index bb64c09..fefa191 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType5.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DEFINITIONType5.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DocumentRoot.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DocumentRoot.java
index c6ea11b..dc79069 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DocumentRoot.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/DocumentRoot.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/EMBEDDEDVALUE.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/EMBEDDEDVALUE.java
index 200b408..25c4000 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/EMBEDDEDVALUE.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/EMBEDDEDVALUE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ENUMVALUE.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ENUMVALUE.java
index 23d9508..8824c87 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ENUMVALUE.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/ENUMVALUE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/GROUPType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/GROUPType.java
index daddd1b..f94093c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/GROUPType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/GROUPType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/HEADERType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/HEADERType.java
index d4c51b8..ed280a1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/HEADERType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/HEADERType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/OBJECTType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/OBJECTType.java
index e1105b4..61deb3a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/OBJECTType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/OBJECTType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/PROPERTIESType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/PROPERTIESType.java
index 08c9992..7149f9c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/PROPERTIESType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/PROPERTIESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RELATIONGROUP.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RELATIONGROUP.java
index ce64b02..c2d9e3b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RELATIONGROUP.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RELATIONGROUP.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RELATIONGROUPSType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RELATIONGROUPSType.java
index 9214c11..3584414 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RELATIONGROUPSType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RELATIONGROUPSType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RELATIONGROUPSType1.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RELATIONGROUPSType1.java
index 6ed734d..1dd471b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RELATIONGROUPSType1.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RELATIONGROUPSType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RELATIONTYPEType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RELATIONTYPEType.java
index 16c6454..e2f667a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RELATIONTYPEType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RELATIONTYPEType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RIF.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RIF.java
index 7a21218..954b457 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RIF.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RIF.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RIFCONTENT.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RIFCONTENT.java
index f3239e8..fc44624 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RIFCONTENT.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RIFCONTENT.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RIFHEADER.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RIFHEADER.java
index 7663e59..bc612ce 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RIFHEADER.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RIFHEADER.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RIFTOOLEXTENSION.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RIFTOOLEXTENSION.java
index d1878f8..630e99b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RIFTOOLEXTENSION.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RIFTOOLEXTENSION.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RifFactory.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RifFactory.java
index 8cce15e..0608760 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RifFactory.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RifFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RifPackage.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RifPackage.java
index 8225c36..788a4fc 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RifPackage.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/RifPackage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SOURCEType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SOURCEType.java
index 660d723..7d74741 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SOURCEType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SOURCEType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECATTRIBUTESType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECATTRIBUTESType.java
index 7c46c59..44f77cb 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECATTRIBUTESType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECATTRIBUTESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUP.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUP.java
index 85c648c..abab42f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUP.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUP.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPHIERARCHY.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPHIERARCHY.java
index b7923a5..c93e25a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPHIERARCHY.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPHIERARCHY.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPHIERARCHYROOT.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPHIERARCHYROOT.java
index 327bb7f..05f9b12 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPHIERARCHYROOT.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPHIERARCHYROOT.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPHIERARCHYROOTSType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPHIERARCHYROOTSType.java
index de75e50..0bd85e0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPHIERARCHYROOTSType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPHIERARCHYROOTSType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPSType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPSType.java
index 68db8b6..746a77c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPSType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPSType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPSType1.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPSType1.java
index 2b0e867..02bbfa1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPSType1.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECGROUPSType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHIESType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHIESType.java
index fcda863..78ce907 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHIESType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHIESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHY.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHY.java
index 26a29f7..8eff6d8 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHY.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHY.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHYROOT.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHYROOT.java
index 3b5309b..53fba8b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHYROOT.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHYROOT.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHYROOTSType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHYROOTSType.java
index 1716a83..88ed6a9 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHYROOTSType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHYROOTSType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHYROOTSType1.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHYROOTSType1.java
index 5902e50..7abf74f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHYROOTSType1.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECHIERARCHYROOTSType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECIFIEDVALUESType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECIFIEDVALUESType.java
index ad087d5..5c58949 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECIFIEDVALUESType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECIFIEDVALUESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECOBJECT.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECOBJECT.java
index 93adf05..83c582f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECOBJECT.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECOBJECT.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECOBJECTSType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECOBJECTSType.java
index a45ac62..06dce7b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECOBJECTSType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECOBJECTSType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECOBJECTSType1.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECOBJECTSType1.java
index 82c19e4..ce4cf21 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECOBJECTSType1.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECOBJECTSType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECOBJECTSType2.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECOBJECTSType2.java
index 9c4950c..e377173 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECOBJECTSType2.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECOBJECTSType2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECRELATION.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECRELATION.java
index 0443af7..42a34f1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECRELATION.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECRELATION.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECRELATIONSType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECRELATIONSType.java
index 248c216..f6bcc4a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECRELATIONSType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECRELATIONSType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECRELATIONSType1.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECRELATIONSType1.java
index 70fae1f..c2c5d60 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECRELATIONSType1.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECRELATIONSType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECRELATIONSType2.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECRELATIONSType2.java
index 8068356..b983fe3 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECRELATIONSType2.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECRELATIONSType2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECTYPE.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECTYPE.java
index db49236..3270260 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECTYPE.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECTYPE.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECTYPESType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECTYPESType.java
index f43f05f..168bc39 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECTYPESType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECTYPESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECTYPESType1.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECTYPESType1.java
index 22eb3e7..80fcd8c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECTYPESType1.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/SPECTYPESType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TARGETGROUPType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TARGETGROUPType.java
index eec6880..eb342c7 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TARGETGROUPType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TARGETGROUPType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TARGETType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TARGETType.java
index f5d4a16..2934d9f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TARGETType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TARGETType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TOOLEXTENSIONSType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TOOLEXTENSIONSType.java
index 6bbbab3..fc0ea91 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TOOLEXTENSIONSType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TOOLEXTENSIONSType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType.java
index 9398554..120301e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType1.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType1.java
index dd090e8..9d8d7ac 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType1.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType2.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType2.java
index 2b4653f..b5a6222 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType2.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType3.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType3.java
index 4ed8833..53ca823 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType3.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType4.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType4.java
index 3d11f56..4bce9f9 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType4.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType4.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType5.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType5.java
index b7647ce..eac55bd 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType5.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType5.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType6.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType6.java
index d7079c2..eeef087 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType6.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType6.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType7.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType7.java
index 7a8471f..a43dede 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType7.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/TYPEType7.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType.java
index a4d25cd..0a25b08 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType1.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType1.java
index 61ee9a2..0ba83ba 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType1.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType2.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType2.java
index 827ad7e..0bc60f1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType2.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType3.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType3.java
index 04cd56a..71ef579 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType3.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType4.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType4.java
index 2dcd24d..364195a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType4.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType4.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType5.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType5.java
index 5d735c1..a271205 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType5.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/VALUESType5.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/XHTMLCONTENT.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/XHTMLCONTENT.java
index f4764b5..5a4466a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/XHTMLCONTENT.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/XHTMLCONTENT.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/XMLCONTENT.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/XMLCONTENT.java
index d6e7077..3abe9db 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/XMLCONTENT.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/XMLCONTENT.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ACCESSPOLICIESTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ACCESSPOLICIESTypeImpl.java
index d895cf2..3e88872 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ACCESSPOLICIESTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ACCESSPOLICIESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ACCESSPOLICYImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ACCESSPOLICYImpl.java
index 5567ea3..f4c9103 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ACCESSPOLICYImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ACCESSPOLICYImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEDEFINITIONCOMPLEXImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEDEFINITIONCOMPLEXImpl.java
index db9108d..a435ecf 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEDEFINITIONCOMPLEXImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEDEFINITIONCOMPLEXImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEDEFINITIONENUMERATIONImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEDEFINITIONENUMERATIONImpl.java
index 92ab52a..ce29ae2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEDEFINITIONENUMERATIONImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEDEFINITIONENUMERATIONImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEDEFINITIONSIMPLEImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEDEFINITIONSIMPLEImpl.java
index ba6f56d..7aa88de 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEDEFINITIONSIMPLEImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEDEFINITIONSIMPLEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEDEFINITIONSTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEDEFINITIONSTypeImpl.java
index 9db0452..659ebc6 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEDEFINITIONSTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEDEFINITIONSTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEEMBEDDEDDOCUMENTImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEEMBEDDEDDOCUMENTImpl.java
index da862f3..5a62740 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEEMBEDDEDDOCUMENTImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEEMBEDDEDDOCUMENTImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEEMBEDDEDFILEImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEEMBEDDEDFILEImpl.java
index c1b3b3a..5dc811b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEEMBEDDEDFILEImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEEMBEDDEDFILEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEENUMERATIONImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEENUMERATIONImpl.java
index 9714bb2..ed1a04f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEENUMERATIONImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEENUMERATIONImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEFILEREFERENCEImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEFILEREFERENCEImpl.java
index ba12b1f..a5da955 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEFILEREFERENCEImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEFILEREFERENCEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUESIMPLEImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUESIMPLEImpl.java
index 4eeb173..742d151 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUESIMPLEImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUESIMPLEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUESTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUESTypeImpl.java
index 64f682d..7248561 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUESTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEXMLDATAImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEXMLDATAImpl.java
index 95d9b22..f964096 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEXMLDATAImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ATTRIBUTEVALUEXMLDATAImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/BINARYCONTENTImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/BINARYCONTENTImpl.java
index dddd1be..e788c82 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/BINARYCONTENTImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/BINARYCONTENTImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CHILDRENType1Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CHILDRENType1Impl.java
index 1c47484..d13bc3a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CHILDRENType1Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CHILDRENType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CHILDRENType2Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CHILDRENType2Impl.java
index d4cd34b..5da8e9a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CHILDRENType2Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CHILDRENType2Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CHILDRENType3Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CHILDRENType3Impl.java
index 5c90a13..43576cf 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CHILDRENType3Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CHILDRENType3Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CHILDRENTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CHILDRENTypeImpl.java
index 8cab9e1..7c1a68a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CHILDRENTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CHILDRENTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CORECONTENTTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CORECONTENTTypeImpl.java
index 44a3850..71e161e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CORECONTENTTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/CORECONTENTTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONBINARYFILEImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONBINARYFILEImpl.java
index bb83d00..1f0f2d1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONBINARYFILEImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONBINARYFILEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONBOOLEANImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONBOOLEANImpl.java
index 6530f80..2a2fed0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONBOOLEANImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONBOOLEANImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONDATEImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONDATEImpl.java
index 34cd365..e507226 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONDATEImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONDATEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONDOCUMENTImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONDOCUMENTImpl.java
index 9414244..e6adcfc 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONDOCUMENTImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONDOCUMENTImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONENUMERATIONImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONENUMERATIONImpl.java
index bb83799..872ec90 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONENUMERATIONImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONENUMERATIONImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONINTEGERImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONINTEGERImpl.java
index c857455..5b5da89 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONINTEGERImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONINTEGERImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONREALImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONREALImpl.java
index 4d2662e..bc0dafe 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONREALImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONREALImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONSTRINGImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONSTRINGImpl.java
index e4c89d7..7702fc1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONSTRINGImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONSTRINGImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONSTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONSTypeImpl.java
index fbe4e27..cfdfe2c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONSTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONSTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONXMLDATAImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONXMLDATAImpl.java
index cdbc2a6..bb84cbd 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONXMLDATAImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPEDEFINITIONXMLDATAImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPESTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPESTypeImpl.java
index ab40bf7..601a4d8 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPESTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DATATYPESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFAULTVALUEType1Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFAULTVALUEType1Impl.java
index 8d28c93..059a651 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFAULTVALUEType1Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFAULTVALUEType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFAULTVALUEType2Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFAULTVALUEType2Impl.java
index b30e89d..3d44dfe 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFAULTVALUEType2Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFAULTVALUEType2Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFAULTVALUETypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFAULTVALUETypeImpl.java
index 14a9402..8afc2ee 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFAULTVALUETypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFAULTVALUETypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType1Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType1Impl.java
index 313ee39..c3045f1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType1Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType2Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType2Impl.java
index 050e87b..99cdd81 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType2Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType2Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType3Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType3Impl.java
index ac5f8d4..897fb9b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType3Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType3Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType4Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType4Impl.java
index bac8136..b75ebb0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType4Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType4Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType5Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType5Impl.java
index 4023f5e..db676ef 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType5Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONType5Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONTypeImpl.java
index 5a19131..5b284a5 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DEFINITIONTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DocumentRootImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DocumentRootImpl.java
index 9130030..a21acff 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DocumentRootImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/DocumentRootImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/EMBEDDEDVALUEImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/EMBEDDEDVALUEImpl.java
index 78654c7..e3fd244 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/EMBEDDEDVALUEImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/EMBEDDEDVALUEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ENUMVALUEImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ENUMVALUEImpl.java
index 2576a16..c266b3d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ENUMVALUEImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/ENUMVALUEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/GROUPTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/GROUPTypeImpl.java
index 0018f46..1454891 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/GROUPTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/GROUPTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/HEADERTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/HEADERTypeImpl.java
index edab0a5..cd984e7 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/HEADERTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/HEADERTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/OBJECTTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/OBJECTTypeImpl.java
index 78afea0..5dff778 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/OBJECTTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/OBJECTTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/PROPERTIESTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/PROPERTIESTypeImpl.java
index a4f0c75..9f3e74a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/PROPERTIESTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/PROPERTIESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RELATIONGROUPImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RELATIONGROUPImpl.java
index f2f1d34..8675897 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RELATIONGROUPImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RELATIONGROUPImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RELATIONGROUPSType1Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RELATIONGROUPSType1Impl.java
index a3e41b5..7a60f46 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RELATIONGROUPSType1Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RELATIONGROUPSType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RELATIONGROUPSTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RELATIONGROUPSTypeImpl.java
index e77983a..19ab3a3 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RELATIONGROUPSTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RELATIONGROUPSTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RELATIONTYPETypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RELATIONTYPETypeImpl.java
index 67da0e5..37798d2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RELATIONTYPETypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RELATIONTYPETypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RIFCONTENTImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RIFCONTENTImpl.java
index a18f399..f602354 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RIFCONTENTImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RIFCONTENTImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RIFHEADERImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RIFHEADERImpl.java
index 70d2c9c..5842e17 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RIFHEADERImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RIFHEADERImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RIFImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RIFImpl.java
index 1dd20d8..2e35289 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RIFImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RIFImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RIFTOOLEXTENSIONImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RIFTOOLEXTENSIONImpl.java
index 857e9b7..6114dc1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RIFTOOLEXTENSIONImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RIFTOOLEXTENSIONImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RifFactoryImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RifFactoryImpl.java
index 2ac487c..06b0129 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RifFactoryImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RifFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RifPackageImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RifPackageImpl.java
index 6b0dd74..76ee198 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RifPackageImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/RifPackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SOURCETypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SOURCETypeImpl.java
index f1e0591..d2364fa 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SOURCETypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SOURCETypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECATTRIBUTESTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECATTRIBUTESTypeImpl.java
index b5bf878..c516029 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECATTRIBUTESTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECATTRIBUTESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPHIERARCHYImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPHIERARCHYImpl.java
index 6884251..337b079 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPHIERARCHYImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPHIERARCHYImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPHIERARCHYROOTImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPHIERARCHYROOTImpl.java
index d9f97a5..92bfc83 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPHIERARCHYROOTImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPHIERARCHYROOTImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPHIERARCHYROOTSTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPHIERARCHYROOTSTypeImpl.java
index 5c4b89a..5b3dfd9 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPHIERARCHYROOTSTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPHIERARCHYROOTSTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPImpl.java
index 81246bf..5645b54 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPSType1Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPSType1Impl.java
index 52e5f22..e6e5c24 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPSType1Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPSType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPSTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPSTypeImpl.java
index 5b7a4a9..050aca1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPSTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECGROUPSTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHIESTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHIESTypeImpl.java
index 3a60212..73f9c43 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHIESTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHIESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHYImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHYImpl.java
index c3ae130..4f7dae9 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHYImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHYImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHYROOTImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHYROOTImpl.java
index e338aaf..7d2b946 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHYROOTImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHYROOTImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHYROOTSType1Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHYROOTSType1Impl.java
index 942bb6d..76b9e23 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHYROOTSType1Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHYROOTSType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHYROOTSTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHYROOTSTypeImpl.java
index 503df38..a928117 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHYROOTSTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECHIERARCHYROOTSTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECIFIEDVALUESTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECIFIEDVALUESTypeImpl.java
index ddc4e8a..06e5d66 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECIFIEDVALUESTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECIFIEDVALUESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECOBJECTImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECOBJECTImpl.java
index 078bcca..ff54dd7 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECOBJECTImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECOBJECTImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECOBJECTSType1Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECOBJECTSType1Impl.java
index a4776a2..6d9b332 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECOBJECTSType1Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECOBJECTSType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECOBJECTSType2Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECOBJECTSType2Impl.java
index 9e80e43..3eebcd1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECOBJECTSType2Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECOBJECTSType2Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECOBJECTSTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECOBJECTSTypeImpl.java
index 8011b59..1399585 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECOBJECTSTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECOBJECTSTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECRELATIONImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECRELATIONImpl.java
index 3826b1e..bb620c4 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECRELATIONImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECRELATIONImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECRELATIONSType1Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECRELATIONSType1Impl.java
index 70e049c..a707580 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECRELATIONSType1Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECRELATIONSType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECRELATIONSType2Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECRELATIONSType2Impl.java
index 241c60f..87e40a8 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECRELATIONSType2Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECRELATIONSType2Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECRELATIONSTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECRELATIONSTypeImpl.java
index 040debf..c2071d5 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECRELATIONSTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECRELATIONSTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECTYPEImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECTYPEImpl.java
index 945fae6..97e49ff 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECTYPEImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECTYPEImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECTYPESType1Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECTYPESType1Impl.java
index 54bbbd2..6b52289 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECTYPESType1Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECTYPESType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECTYPESTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECTYPESTypeImpl.java
index 0b4ba7b..b26ff9a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECTYPESTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/SPECTYPESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TARGETGROUPTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TARGETGROUPTypeImpl.java
index e717a29..5e9943c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TARGETGROUPTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TARGETGROUPTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TARGETTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TARGETTypeImpl.java
index 7e96a00..31e3e20 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TARGETTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TARGETTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TOOLEXTENSIONSTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TOOLEXTENSIONSTypeImpl.java
index 334e1aa..b26a4d4 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TOOLEXTENSIONSTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TOOLEXTENSIONSTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType1Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType1Impl.java
index 6258cbc..5e26854 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType1Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType2Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType2Impl.java
index 7b1c707..96b372d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType2Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType2Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType3Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType3Impl.java
index 1b1d98c..2656d78 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType3Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType3Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType4Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType4Impl.java
index 18adb0b..0dcccdb 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType4Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType4Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType5Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType5Impl.java
index c3cbf34..1fade93 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType5Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType5Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType6Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType6Impl.java
index 64978a3..8df8436 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType6Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType6Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType7Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType7Impl.java
index bae5b09..5df13b2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType7Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPEType7Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPETypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPETypeImpl.java
index a2d7aa9..bc06e2c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPETypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/TYPETypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType1Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType1Impl.java
index 78f157a..36d16a4 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType1Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType1Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType2Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType2Impl.java
index 38af2c7..88a628d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType2Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType2Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType3Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType3Impl.java
index d04c886..fd22da0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType3Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType3Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType4Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType4Impl.java
index e9086c3..c73560b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType4Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType4Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType5Impl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType5Impl.java
index 18a645d..3c9c573 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType5Impl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESType5Impl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESTypeImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESTypeImpl.java
index 346a59e..12c8fe4 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESTypeImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/VALUESTypeImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/XHTMLCONTENTImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/XHTMLCONTENTImpl.java
index 9833f13..6c84425 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/XHTMLCONTENTImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/XHTMLCONTENTImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/XMLCONTENTImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/XMLCONTENTImpl.java
index d287f96..c3667cd 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/XMLCONTENTImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/impl/XMLCONTENTImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifAdapterFactory.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifAdapterFactory.java
index d4b81ad..05a992e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifAdapterFactory.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifResourceFactoryImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifResourceFactoryImpl.java
index bf84209..9f88cd6 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifResourceFactoryImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifResourceImpl.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifResourceImpl.java
index 97a3b3c..158a95b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifResourceImpl.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifResourceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifSAXXMLHandler.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifSAXXMLHandler.java
index 28229ab..e9a7cfe 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifSAXXMLHandler.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifSAXXMLHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifSwitch.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifSwitch.java
index b26a6ba..bbbad88 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifSwitch.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifSwitch.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifXMLLoad.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifXMLLoad.java
index df40657..8bdf51e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifXMLLoad.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifXMLLoad.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifXMLProcessor.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifXMLProcessor.java
index 2fa5035..ab465d4 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifXMLProcessor.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifXMLProcessor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifXMLSave.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifXMLSave.java
index 953dfc9..e631ea8 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifXMLSave.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/util/RifXMLSave.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ACCESSPOLICIESTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ACCESSPOLICIESTypeValidator.java
index be8449a..9505452 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ACCESSPOLICIESTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ACCESSPOLICIESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ACCESSPOLICYValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ACCESSPOLICYValidator.java
index 5e18c1f..646771e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ACCESSPOLICYValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ACCESSPOLICYValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEDEFINITIONCOMPLEXValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEDEFINITIONCOMPLEXValidator.java
index 94f86a2..30622c2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEDEFINITIONCOMPLEXValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEDEFINITIONCOMPLEXValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEDEFINITIONENUMERATIONValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEDEFINITIONENUMERATIONValidator.java
index 5b744f2..5161428 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEDEFINITIONENUMERATIONValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEDEFINITIONENUMERATIONValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEDEFINITIONSIMPLEValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEDEFINITIONSIMPLEValidator.java
index 46e151d..44f09f3 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEDEFINITIONSIMPLEValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEDEFINITIONSIMPLEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEDEFINITIONSTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEDEFINITIONSTypeValidator.java
index 69d0242..c23b48e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEDEFINITIONSTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEDEFINITIONSTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEEMBEDDEDDOCUMENTValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEEMBEDDEDDOCUMENTValidator.java
index e833e06..fff1be8 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEEMBEDDEDDOCUMENTValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEEMBEDDEDDOCUMENTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEEMBEDDEDFILEValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEEMBEDDEDFILEValidator.java
index 89407e8..34a9a0f 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEEMBEDDEDFILEValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEEMBEDDEDFILEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEENUMERATIONValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEENUMERATIONValidator.java
index 497c310..cbe9b02 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEENUMERATIONValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEENUMERATIONValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEFILEREFERENCEValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEFILEREFERENCEValidator.java
index b8ba67b..90499fc 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEFILEREFERENCEValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEFILEREFERENCEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUESIMPLEValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUESIMPLEValidator.java
index 80ec1b6..cf40e64 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUESIMPLEValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUESIMPLEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUESTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUESTypeValidator.java
index 1b2fa80..601dd2a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUESTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEXMLDATAValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEXMLDATAValidator.java
index d7152a7..37bcebc 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEXMLDATAValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ATTRIBUTEVALUEXMLDATAValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/BINARYCONTENTValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/BINARYCONTENTValidator.java
index 61fe3bc..77be209 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/BINARYCONTENTValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/BINARYCONTENTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CHILDRENType1Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CHILDRENType1Validator.java
index 59f74b6..35c2308 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CHILDRENType1Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CHILDRENType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CHILDRENType2Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CHILDRENType2Validator.java
index 29629a4..fd9d578 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CHILDRENType2Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CHILDRENType2Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CHILDRENType3Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CHILDRENType3Validator.java
index 9e479be..e57bb78 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CHILDRENType3Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CHILDRENType3Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CHILDRENTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CHILDRENTypeValidator.java
index 9a63b7e..a0f0485 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CHILDRENTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CHILDRENTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CORECONTENTTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CORECONTENTTypeValidator.java
index 4fd895d..0097a32 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CORECONTENTTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/CORECONTENTTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONBINARYFILEValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONBINARYFILEValidator.java
index 4acfa6e..50c2531 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONBINARYFILEValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONBINARYFILEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONBOOLEANValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONBOOLEANValidator.java
index d6c76bf..e88cad2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONBOOLEANValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONBOOLEANValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONDATEValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONDATEValidator.java
index dba4eda..532fa13 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONDATEValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONDATEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONDOCUMENTValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONDOCUMENTValidator.java
index 9d88023..e9c9809 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONDOCUMENTValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONDOCUMENTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONENUMERATIONValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONENUMERATIONValidator.java
index e9c080c..4e8803a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONENUMERATIONValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONENUMERATIONValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONINTEGERValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONINTEGERValidator.java
index 629825f..951634e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONINTEGERValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONINTEGERValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONREALValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONREALValidator.java
index 0a19b32..dd172fa 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONREALValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONREALValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONSTRINGValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONSTRINGValidator.java
index 1f04518..303da04 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONSTRINGValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONSTRINGValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONSTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONSTypeValidator.java
index 21e5913..af10ef6 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONSTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONSTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONXMLDATAValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONXMLDATAValidator.java
index f07d691..3fae093 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONXMLDATAValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPEDEFINITIONXMLDATAValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPESTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPESTypeValidator.java
index c665d98..05d4bed 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPESTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DATATYPESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFAULTVALUEType1Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFAULTVALUEType1Validator.java
index 4450cc3..109808c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFAULTVALUEType1Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFAULTVALUEType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFAULTVALUEType2Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFAULTVALUEType2Validator.java
index 1a52548..7d92a24 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFAULTVALUEType2Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFAULTVALUEType2Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFAULTVALUETypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFAULTVALUETypeValidator.java
index 73f081c..1e094c4 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFAULTVALUETypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFAULTVALUETypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType1Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType1Validator.java
index 075ef40..70f10ae 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType1Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType2Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType2Validator.java
index 3ff81f7..0e3175e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType2Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType2Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType3Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType3Validator.java
index e291def..98e90c0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType3Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType3Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType4Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType4Validator.java
index fee5a14..7c9ba6d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType4Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType4Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType5Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType5Validator.java
index e270f2a..80bb507 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType5Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONType5Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONTypeValidator.java
index d209c68..a012613 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DEFINITIONTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DocumentRootValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DocumentRootValidator.java
index 95d72fc..aea18b1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DocumentRootValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/DocumentRootValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/EMBEDDEDVALUEValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/EMBEDDEDVALUEValidator.java
index 34146f5..5060e5a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/EMBEDDEDVALUEValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/EMBEDDEDVALUEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ENUMVALUEValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ENUMVALUEValidator.java
index b1439bd..0913a5c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ENUMVALUEValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/ENUMVALUEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/GROUPTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/GROUPTypeValidator.java
index 7543b59..f28f87b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/GROUPTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/GROUPTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/HEADERTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/HEADERTypeValidator.java
index 007b90b..7a33ead 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/HEADERTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/HEADERTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/OBJECTTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/OBJECTTypeValidator.java
index 70dd146..c954f00 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/OBJECTTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/OBJECTTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/PROPERTIESTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/PROPERTIESTypeValidator.java
index 9dc5b9b..d28f7dd 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/PROPERTIESTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/PROPERTIESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RELATIONGROUPSType1Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RELATIONGROUPSType1Validator.java
index c92bc76..71f63ea 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RELATIONGROUPSType1Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RELATIONGROUPSType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RELATIONGROUPSTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RELATIONGROUPSTypeValidator.java
index 3191a82..391df7d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RELATIONGROUPSTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RELATIONGROUPSTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RELATIONGROUPValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RELATIONGROUPValidator.java
index a68370f..a46ee4a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RELATIONGROUPValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RELATIONGROUPValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RELATIONTYPETypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RELATIONTYPETypeValidator.java
index a469761..25748de 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RELATIONTYPETypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RELATIONTYPETypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RIFCONTENTValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RIFCONTENTValidator.java
index 925aa62..efbe985 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RIFCONTENTValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RIFCONTENTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RIFHEADERValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RIFHEADERValidator.java
index 8c9d0d8..028968a 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RIFHEADERValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RIFHEADERValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RIFTOOLEXTENSIONValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RIFTOOLEXTENSIONValidator.java
index 720caf4..f92dbee 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RIFTOOLEXTENSIONValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RIFTOOLEXTENSIONValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RIFValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RIFValidator.java
index 39a6cd2..8248ae1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RIFValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/RIFValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SOURCETypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SOURCETypeValidator.java
index 0107c01..9b0c598 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SOURCETypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SOURCETypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECATTRIBUTESTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECATTRIBUTESTypeValidator.java
index 9b2714f..4995ee3 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECATTRIBUTESTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECATTRIBUTESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPHIERARCHYROOTSTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPHIERARCHYROOTSTypeValidator.java
index e510d03..ecf4337 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPHIERARCHYROOTSTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPHIERARCHYROOTSTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPHIERARCHYROOTValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPHIERARCHYROOTValidator.java
index b7f0bab..c657be3 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPHIERARCHYROOTValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPHIERARCHYROOTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPHIERARCHYValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPHIERARCHYValidator.java
index 295520d..0f3c2a6 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPHIERARCHYValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPHIERARCHYValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPSType1Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPSType1Validator.java
index 5e81200..8133518 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPSType1Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPSType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPSTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPSTypeValidator.java
index e63a1d6..d4e8e7d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPSTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPSTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPValidator.java
index ad65b10..48c0587 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECGROUPValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHIESTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHIESTypeValidator.java
index e4a6feb..c4cc9f1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHIESTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHIESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHYROOTSType1Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHYROOTSType1Validator.java
index 519ce95..45253ae 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHYROOTSType1Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHYROOTSType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHYROOTSTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHYROOTSTypeValidator.java
index dd4cdd6..461721e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHYROOTSTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHYROOTSTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHYROOTValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHYROOTValidator.java
index c3b5add..1002c8e 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHYROOTValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHYROOTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHYValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHYValidator.java
index 0dcff53..3cc1556 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHYValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECHIERARCHYValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECIFIEDVALUESTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECIFIEDVALUESTypeValidator.java
index 4c6804b..770a788 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECIFIEDVALUESTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECIFIEDVALUESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECOBJECTSType1Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECOBJECTSType1Validator.java
index c06a6dc..f6804a2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECOBJECTSType1Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECOBJECTSType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECOBJECTSType2Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECOBJECTSType2Validator.java
index d1d2ac9..1a803be 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECOBJECTSType2Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECOBJECTSType2Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECOBJECTSTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECOBJECTSTypeValidator.java
index 98439e8..cd1bcea 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECOBJECTSTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECOBJECTSTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECOBJECTValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECOBJECTValidator.java
index bb0fa75..faa55f6 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECOBJECTValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECOBJECTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECRELATIONSType1Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECRELATIONSType1Validator.java
index c75138f..0c662f6 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECRELATIONSType1Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECRELATIONSType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECRELATIONSType2Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECRELATIONSType2Validator.java
index 33a75cc..0be11e1 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECRELATIONSType2Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECRELATIONSType2Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECRELATIONSTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECRELATIONSTypeValidator.java
index 2e59c0c..c54084b 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECRELATIONSTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECRELATIONSTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECRELATIONValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECRELATIONValidator.java
index 550f0f6..d939ae0 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECRELATIONValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECRELATIONValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECTYPESType1Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECTYPESType1Validator.java
index beb39ff..a874379 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECTYPESType1Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECTYPESType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECTYPESTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECTYPESTypeValidator.java
index 5b54ab6..7a93761 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECTYPESTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECTYPESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECTYPEValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECTYPEValidator.java
index 7441410..9568d23 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECTYPEValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/SPECTYPEValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TARGETGROUPTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TARGETGROUPTypeValidator.java
index bc3a17e..977463d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TARGETGROUPTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TARGETGROUPTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TARGETTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TARGETTypeValidator.java
index 54765c8..db2ac79 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TARGETTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TARGETTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TOOLEXTENSIONSTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TOOLEXTENSIONSTypeValidator.java
index 52a6c8e..89605b2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TOOLEXTENSIONSTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TOOLEXTENSIONSTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType1Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType1Validator.java
index c3c60f0..c6fd89c 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType1Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType2Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType2Validator.java
index a2ad18b..73fe788 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType2Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType2Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType3Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType3Validator.java
index 5d33f10..38c9dbc 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType3Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType3Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType4Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType4Validator.java
index 249756a..8941765 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType4Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType4Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType5Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType5Validator.java
index 3f3b8fa..607a7ae 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType5Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType5Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType6Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType6Validator.java
index 9e5b20f..80c9088 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType6Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType6Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType7Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType7Validator.java
index 8be46ad..fa95488 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType7Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPEType7Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPETypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPETypeValidator.java
index 9c82449..93483f7 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPETypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/TYPETypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType1Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType1Validator.java
index 9e01b7a..34a4a95 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType1Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType1Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType2Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType2Validator.java
index 01340fd..6da2d01 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType2Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType2Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType3Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType3Validator.java
index ebe05cb..c595f90 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType3Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType3Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType4Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType4Validator.java
index 14524a5..bc267bd 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType4Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType4Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType5Validator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType5Validator.java
index a6512c4..8aa5588 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType5Validator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESType5Validator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESTypeValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESTypeValidator.java
index 8b94fff..af97b99 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESTypeValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/VALUESTypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/XHTMLCONTENTValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/XHTMLCONTENTValidator.java
index 910ed0f..cb375a2 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/XHTMLCONTENTValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/XHTMLCONTENTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/XMLCONTENTValidator.java b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/XMLCONTENTValidator.java
index 9206367..2ede20d 100644
--- a/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/XMLCONTENTValidator.java
+++ b/org.eclipse.rmf.rif12.xsd.model/src/org/eclipse/rmf/rif12/xsd/validation/XMLCONTENTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 itemis GmbH.

+ * Copyright (c) 2011, 2012 itemis GmbH.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

diff --git a/org.eclipse.rmf.serialization/META-INF/MANIFEST.MF b/org.eclipse.rmf.serialization/META-INF/MANIFEST.MF
index 7c802e2..5f4b70d 100644
--- a/org.eclipse.rmf.serialization/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.serialization/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.rmf.serialization;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.apache.xerces,
diff --git a/org.eclipse.rmf.serialization/build.properties b/org.eclipse.rmf.serialization/build.properties
index c1eb7d7..fe0783d 100644
--- a/org.eclipse.rmf.serialization/build.properties
+++ b/org.eclipse.rmf.serialization/build.properties
@@ -1,3 +1,13 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
diff --git a/org.eclipse.rmf.serialization/epl-v10.html b/org.eclipse.rmf.serialization/epl-v10.html
index 84ec251..3998fce 100644
--- a/org.eclipse.rmf.serialization/epl-v10.html
+++ b/org.eclipse.rmf.serialization/epl-v10.html
@@ -27,7 +27,7 @@
 
 <body lang="EN-US">
 
-<p align=center><b>Eclipse Public License - v 1.0</b></p>
+<h2>Eclipse Public License - v 1.0</h2>
 
 <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
 PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
@@ -258,4 +258,4 @@
 
 </body>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.serialization/notice.html b/org.eclipse.rmf.serialization/notice.html
index f19c483..c3d34c3 100644
--- a/org.eclipse.rmf.serialization/notice.html
+++ b/org.eclipse.rmf.serialization/notice.html
@@ -8,7 +8,7 @@
 
 <body lang="EN-US">
 <h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
+<p>April 9, 2014</p>
 
 <h3>Usage Of Content</h3>
 
@@ -62,7 +62,6 @@
        <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
        <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
        <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
        <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
 </ul>
 
diff --git a/org.eclipse.rmf.serialization/plugin.properties b/org.eclipse.rmf.serialization/plugin.properties
index d9f49fd..08b1475 100644
--- a/org.eclipse.rmf.serialization/plugin.properties
+++ b/org.eclipse.rmf.serialization/plugin.properties
@@ -1,11 +1,13 @@
-# Copyright (c) 2012 itemis AG.
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # Contributors:
-#     Mark Broerkens - initial API and implementation
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 
 pluginName = RMF Core Serialization (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/org.eclipse.rmf.serialization/pom.xml b/org.eclipse.rmf.serialization/pom.xml
index 5d96828..c2c08e8 100644
--- a/org.eclipse.rmf.serialization/pom.xml
+++ b/org.eclipse.rmf.serialization/pom.xml
@@ -19,31 +19,13 @@
 	<parent>
 		<groupId>org.eclipse.rmf</groupId>
 		<artifactId>org.eclipse.rmf.releng</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.10.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.rmf.serialization</artifactId>
-	<version>0.9.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.rmf.plugins</groupId>
 	<properties>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   	</properties>
- 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>plugin-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/internal/serialization/XMLPersistenceMappingHandler.java b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/internal/serialization/XMLPersistenceMappingHandler.java
index c7bfe7d..888eab5 100644
--- a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/internal/serialization/XMLPersistenceMappingHandler.java
+++ b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/internal/serialization/XMLPersistenceMappingHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/internal/serialization/XMLPersistenceMappingHelperImpl.java b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/internal/serialization/XMLPersistenceMappingHelperImpl.java
index c34b53c..58c4476 100644
--- a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/internal/serialization/XMLPersistenceMappingHelperImpl.java
+++ b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/internal/serialization/XMLPersistenceMappingHelperImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/internal/serialization/XMLPersistenceMappingLoadImpl.java b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/internal/serialization/XMLPersistenceMappingLoadImpl.java
index cfcd02f..96b4ba2 100644
--- a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/internal/serialization/XMLPersistenceMappingLoadImpl.java
+++ b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/internal/serialization/XMLPersistenceMappingLoadImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/internal/serialization/XMLPersistenceMappingSaveImpl.java b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/internal/serialization/XMLPersistenceMappingSaveImpl.java
index 530293f..4042167 100644
--- a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/internal/serialization/XMLPersistenceMappingSaveImpl.java
+++ b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/internal/serialization/XMLPersistenceMappingSaveImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/IdAdapter.java b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/IdAdapter.java
index 53d82fe..0de7ac2 100644
--- a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/IdAdapter.java
+++ b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/IdAdapter.java
@@ -1,3 +1,14 @@
+/**
+ * Copyright (c) 2013 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Mark Broerkens - initial API and implementation
+ * 
+ */
 package org.eclipse.rmf.serialization;
 
 import java.util.Collection;
diff --git a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingExtendedMetaData.java b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingExtendedMetaData.java
index 1705a14..72da53e 100644
--- a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingExtendedMetaData.java
+++ b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingExtendedMetaData.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingExtendedMetaDataImpl.java b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingExtendedMetaDataImpl.java
index 504d7d8..7840841 100644
--- a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingExtendedMetaDataImpl.java
+++ b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingExtendedMetaDataImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingResource.java b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingResource.java
index df70de3..d2404a4 100644
--- a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingResource.java
+++ b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingResource.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingResourceFactoryImpl.java b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingResourceFactoryImpl.java
index 0d5e1c9..aba5644 100644
--- a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingResourceFactoryImpl.java
+++ b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingResourceImpl.java b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingResourceImpl.java
index 6883212..6ea3cac 100644
--- a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingResourceImpl.java
+++ b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingResourceImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingResourceSetImpl.java b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingResourceSetImpl.java
index 5a8169f..0a70306 100644
--- a/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingResourceSetImpl.java
+++ b/org.eclipse.rmf.serialization/src/org/eclipse/rmf/serialization/XMLPersistenceMappingResourceSetImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.common/META-INF/MANIFEST.MF b/org.eclipse.rmf.tests.reqif10.common/META-INF/MANIFEST.MF
index 212a37c..b1631e1 100644
--- a/org.eclipse.rmf.tests.reqif10.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.tests.reqif10.common/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rmf.tests.reqif10.common
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.rmf.reqif10.xhtml;bundle-version="0.9.0",
  org.eclipse.rmf.reqif10;bundle-version="0.9.0",
diff --git a/org.eclipse.rmf.tests.reqif10.common/about.html b/org.eclipse.rmf.tests.reqif10.common/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.tests.reqif10.common/about.html
+++ b/org.eclipse.rmf.tests.reqif10.common/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.tests.reqif10.common/build.properties b/org.eclipse.rmf.tests.reqif10.common/build.properties
index efe88d4..f2b1f01 100644
--- a/org.eclipse.rmf.tests.reqif10.common/build.properties
+++ b/org.eclipse.rmf.tests.reqif10.common/build.properties
@@ -1,3 +1,13 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
@@ -5,4 +15,5 @@
                about.html,\
                epl-v10.html,\
                notice.html,\
-               build.properties
+               build.properties,\
+               plugin.properties
diff --git a/org.eclipse.rmf.tests.reqif10.common/epl-v10.html b/org.eclipse.rmf.tests.reqif10.common/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.tests.reqif10.common/epl-v10.html
+++ b/org.eclipse.rmf.tests.reqif10.common/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.tests.reqif10.common/notice.html b/org.eclipse.rmf.tests.reqif10.common/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.tests.reqif10.common/notice.html
+++ b/org.eclipse.rmf.tests.reqif10.common/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.tests.reqif10.common/plugin.properties b/org.eclipse.rmf.tests.reqif10.common/plugin.properties
index 8bb65c5..036424a 100644
--- a/org.eclipse.rmf.tests.reqif10.common/plugin.properties
+++ b/org.eclipse.rmf.tests.reqif10.common/plugin.properties
@@ -1,3 +1,13 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 # Copyright (c) 2012 itemis GmbH.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
diff --git a/org.eclipse.rmf.tests.reqif10.common/pom.xml b/org.eclipse.rmf.tests.reqif10.common/pom.xml
index ffa5e8d..f0feb20 100644
--- a/org.eclipse.rmf.tests.reqif10.common/pom.xml
+++ b/org.eclipse.rmf.tests.reqif10.common/pom.xml
@@ -19,11 +19,10 @@
 	<parent>
 		<groupId>org.eclipse.rmf</groupId>
 		<artifactId>org.eclipse.rmf.releng</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.10.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.rmf.tests.reqif10.common</artifactId>
-	<version>0.9.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.rmf.plugins</groupId>
 	<properties>
@@ -34,7 +33,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<executions>
 					<execution>
 						<id>plugin-source</id>
diff --git a/org.eclipse.rmf.tests.reqif10.common/src/org/eclipse/rmf/tests/reqif10/common/ReqIF10XHtmlContentAdapterTests.java b/org.eclipse.rmf.tests.reqif10.common/src/org/eclipse/rmf/tests/reqif10/common/ReqIF10XHtmlContentAdapterTests.java
index 4bff044..7b02708 100644
--- a/org.eclipse.rmf.tests.reqif10.common/src/org/eclipse/rmf/tests/reqif10/common/ReqIF10XHtmlContentAdapterTests.java
+++ b/org.eclipse.rmf.tests.reqif10.common/src/org/eclipse/rmf/tests/reqif10/common/ReqIF10XHtmlContentAdapterTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.common;
 
 import static org.junit.Assert.assertEquals;
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.classpath b/org.eclipse.rmf.tests.reqif10.constraints/.classpath
similarity index 99%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/.classpath
copy to org.eclipse.rmf.tests.reqif10.constraints/.classpath
index 304e861..64c5e31 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.classpath
+++ b/org.eclipse.rmf.tests.reqif10.constraints/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.gitignore b/org.eclipse.rmf.tests.reqif10.constraints/.gitignore
similarity index 100%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/.gitignore
copy to org.eclipse.rmf.tests.reqif10.constraints/.gitignore
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.project b/org.eclipse.rmf.tests.reqif10.constraints/.project
similarity index 90%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/.project
copy to org.eclipse.rmf.tests.reqif10.constraints/.project
index 0032b4b..80edf9a 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.project
+++ b/org.eclipse.rmf.tests.reqif10.constraints/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.rmf.reqif10.pror.presentation.id.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.rmf.tests.reqif10.constraints</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.core.resources.prefs b/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..845273e
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1

+encoding//design/default.ecore=UTF-8

+encoding//design/resources.ecore_diagram=UTF-8

+encoding/<project>=UTF-8

diff --git a/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..3aa46d1
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,372 @@
+#Thu Apr 12 17:16:12 CEST 2012

+eclipse.preferences.version=1

+org.eclipse.jdt.core.codeComplete.argumentPrefixes=

+org.eclipse.jdt.core.codeComplete.argumentSuffixes=

+org.eclipse.jdt.core.codeComplete.fieldPrefixes=

+org.eclipse.jdt.core.codeComplete.fieldSuffixes=

+org.eclipse.jdt.core.codeComplete.localPrefixes=

+org.eclipse.jdt.core.codeComplete.localSuffixes=

+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=

+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=

+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=

+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

+org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.debug.lineNumber=generate

+org.eclipse.jdt.core.compiler.debug.localVariable=generate

+org.eclipse.jdt.core.compiler.debug.sourceFile=generate

+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore

+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning

+org.eclipse.jdt.core.compiler.problem.deadCode=warning

+org.eclipse.jdt.core.compiler.problem.deprecation=warning

+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning

+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore

+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled

+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore

+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning

+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error

+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning

+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled

+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore

+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore

+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore

+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning

+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning

+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore

+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning

+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled

+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore

+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning

+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning

+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning

+org.eclipse.jdt.core.compiler.problem.nullReference=ignore

+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning

+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore

+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore

+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore

+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning

+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore

+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore

+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore

+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore

+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore

+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning

+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled

+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled

+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning

+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled

+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning

+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning

+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning

+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled

+org.eclipse.jdt.core.compiler.problem.unusedImport=warning

+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning

+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore

+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled

+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled

+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

+org.eclipse.jdt.core.compiler.source=1.5

+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_assignment=0

+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_after_package=1

+org.eclipse.jdt.core.formatter.blank_lines_before_field=0

+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

+org.eclipse.jdt.core.formatter.blank_lines_before_method=1

+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

+org.eclipse.jdt.core.formatter.blank_lines_before_package=0

+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true

+org.eclipse.jdt.core.formatter.comment.format_block_comments=true

+org.eclipse.jdt.core.formatter.comment.format_header=false

+org.eclipse.jdt.core.formatter.comment.format_html=true

+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false

+org.eclipse.jdt.core.formatter.comment.format_line_comments=true

+org.eclipse.jdt.core.formatter.comment.format_source_code=true

+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

+org.eclipse.jdt.core.formatter.comment.line_length=120

+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

+org.eclipse.jdt.core.formatter.compact_else_if=true

+org.eclipse.jdt.core.formatter.continuation_indentation=2

+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_empty_lines=false

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

+org.eclipse.jdt.core.formatter.indentation.size=4

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.join_lines_in_comments=true

+org.eclipse.jdt.core.formatter.join_wrapped_lines=true

+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.lineSplit=150

+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1

+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

+org.eclipse.jdt.core.formatter.tabulation.char=tab

+org.eclipse.jdt.core.formatter.tabulation.size=4

+org.eclipse.jdt.core.formatter.use_on_off_tags=false

+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..94bcd86
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,120 @@
+#Wed Apr 04 18:47:36 CEST 2012
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_to_enhanced_for_loop=true
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=false
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=false
+cleanup.remove_unused_private_types=false
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=_Unmanaged profile 'RMF'
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_RMF
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * &lt;copyright&gt;\n * \n * Copyright (c) {contributing company name} and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n * \n * Contributors\: \n *     {contributing company name} - Initial API and implementation\n * \n * &lt;/copyright&gt;\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/*\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=true
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=false
+sp_cleanup.remove_unused_private_types=false
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..ac5f8a2
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Wed Apr 04 18:47:53 CEST 2012
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.pde.prefs b/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..546490c
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,33 @@
+#Wed Apr 04 18:47:36 CEST 2012
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=2
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=2
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.wst.xml.core.prefs b/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.wst.xml.core.prefs
new file mode 100644
index 0000000..2f885f5
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/.settings/org.eclipse.wst.xml.core.prefs
@@ -0,0 +1,18 @@
+#Wed Apr 04 18:48:00 CEST 2012
+attributeHasNoValue=2
+eclipse.preferences.version=1
+endTagWithAttributes=2
+honourAllSchemaLocations=true
+indicateNoGrammar=1
+indiciateNoDocumentElement=-1
+markupValidation=true
+missingClosingBracket=2
+missingClosingQuote=2
+missingEndTag=2
+missingQuotes=2
+missingStartTag=2
+missingTagName=2
+namespaceInPITarget=2
+whitespaceAtStart=2
+whitespaceBeforeTagName=2
+xinclude=true
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/META-INF/MANIFEST.MF b/org.eclipse.rmf.tests.reqif10.constraints/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..c7ab340
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ReqIF 1.0.1 Constraints Tests
+Bundle-SymbolicName: org.eclipse.rmf.tests.reqif10.constraints
+Bundle-Version: 0.10.0.qualifier
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.rmf.reqif10.constraints,
+ org.eclipse.rmf.reqif10,
+ org.junit
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.rmf.tests.reqif10.constraints
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html b/org.eclipse.rmf.tests.reqif10.constraints/about.html
similarity index 99%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
copy to org.eclipse.rmf.tests.reqif10.constraints/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
+++ b/org.eclipse.rmf.tests.reqif10.constraints/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/build.properties b/org.eclipse.rmf.tests.reqif10.constraints/build.properties
new file mode 100644
index 0000000..af022dd
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/build.properties
@@ -0,0 +1,17 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               epl-v10.html,\
+               notice.html
diff --git a/org.eclipse.rmf.examples.feature/epl-v10.html b/org.eclipse.rmf.tests.reqif10.constraints/epl-v10.html
similarity index 99%
copy from org.eclipse.rmf.examples.feature/epl-v10.html
copy to org.eclipse.rmf.tests.reqif10.constraints/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.examples.feature/epl-v10.html
+++ b/org.eclipse.rmf.tests.reqif10.constraints/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/notice.html b/org.eclipse.rmf.tests.reqif10.constraints/notice.html
similarity index 97%
copy from org.eclipse.rmf.examples.feature/notice.html
copy to org.eclipse.rmf.tests.reqif10.constraints/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.examples.feature/notice.html
+++ b/org.eclipse.rmf.tests.reqif10.constraints/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/pom.xml b/org.eclipse.rmf.tests.reqif10.constraints/pom.xml
similarity index 68%
rename from org.eclipse.rmf.reqif10.pror.presentation.id.tests/pom.xml
rename to org.eclipse.rmf.tests.reqif10.constraints/pom.xml
index 9f0d4fa..26a3015 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/pom.xml
+++ b/org.eclipse.rmf.tests.reqif10.constraints/pom.xml
@@ -1,58 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project

-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"

-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<groupId>org.eclipse.rmf</groupId>

-		<artifactId>org.eclipse.rmf.releng</artifactId>

-		<version>0.9.0-SNAPSHOT</version>

-		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>

-	</parent>

-	<groupId>org.eclipse.rmf.plugins</groupId>

-	<artifactId>org.eclipse.rmf.reqif10.pror.presentation.id.tests</artifactId>

-	<version>0.9.0-SNAPSHOT</version>

-	<packaging>eclipse-test-plugin</packaging>

-	<profiles>

-		<profile>

-			<id>macosx</id>

-			<activation>

-				<os>

-					<family>mac</family>

-				</os>

-			</activation>

-			<properties>

-				<test.vmargs>-Xmx512m -XX:MaxPermSize=256m -XstartOnFirstThread</test.vmargs>

-			</properties>

-		</profile>

-		<profile>

-			<id>other-os</id>

-			<activation>

-				<os>

-					<family>!mac</family>

-				</os>

-			</activation>

-			<properties>

-				<test.vmargs>-Xmx512m -XX:MaxPermSize=256m</test.vmargs>

-			</properties>

-		</profile>

-	</profiles>

-	<build>

-		<sourceDirectory>src</sourceDirectory>

-		<plugins>

-			<plugin>

-				<groupId>org.eclipse.tycho</groupId>

-				<artifactId>tycho-surefire-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<configuration>

-					<includes>

-						<include>**/All*Tests.class</include>

-					</includes>

-					<useUIHarness>false</useUIHarness>

-					<useUIThread>false</useUIThread>

-					<argLine>${test.vmargs}</argLine>

-				</configuration>

-			</plugin>

-		</plugins>

-	</build>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ <copyright>
+Copyright (c) 2012 itemis AG.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+
+Contributors:
+    Mark Broerkens - initial API and implementation
+ </copyright>
+
+-->
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.rmf</groupId>
+		<artifactId>org.eclipse.rmf.releng</artifactId>
+		<version>0.10.0-SNAPSHOT</version>
+		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
+	</parent>
+	<groupId>com.yakindu.rmf.plugins</groupId>
+	<artifactId>org.eclipse.rmf.tests.reqif10.constraints</artifactId>
+	<packaging>eclipse-test-plugin</packaging>
+	<profiles>
+		<profile>
+			<id>macosx</id>
+			<activation>
+				<os>
+					<family>mac</family>
+				</os>
+			</activation>
+			<properties>
+				<test.vmargs>-Xmx512m -XX:MaxPermSize=256m -XstartOnFirstThread</test.vmargs>
+			</properties>
+		</profile>
+		<profile>
+			<id>other-os</id>
+			<activation>
+				<os>
+					<family>!mac</family>
+				</os>
+			</activation>
+			<properties>
+				<test.vmargs>-Xmx512m -XX:MaxPermSize=256m</test.vmargs>
+			</properties>
+		</profile>
+	</profiles>
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<includes>
+						<include>**/*Tests.class</include>
+						<exclude>**/Abstract*Tests.class</exclude>
+					</includes>
+					<useUIHarness>false</useUIHarness>
+					<useUIThread>false</useUIThread>
+					<argLine>${test.vmargs}</argLine>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/AbstractConstraintTest.java b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/AbstractConstraintTest.java
new file mode 100644
index 0000000..0f16d40
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/AbstractConstraintTest.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2014 itemis AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Mark Broerkens - initial API and implementation
+ * 
+ */
+package org.eclipse.rmf.tests.reqif10.constraints;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.validation.model.EvaluationMode;
+import org.eclipse.emf.validation.service.IConstraintDescriptor;
+import org.eclipse.emf.validation.service.IConstraintFilter;
+import org.eclipse.emf.validation.service.IValidator;
+import org.eclipse.emf.validation.service.ModelValidationService;
+import org.junit.Before;
+import org.junit.BeforeClass;
+
+public abstract class AbstractConstraintTest {
+
+	static IValidator<EObject> validator = null;
+	static IConstraintFilter filter = null;
+
+	@BeforeClass
+	public static void setupOnce() throws Exception {
+		validator = ModelValidationService.getInstance().newValidator(EvaluationMode.BATCH);
+		validator.setReportSuccesses(true);
+	}
+
+	@Before
+	public void setUp() throws Exception {
+		if (null == filter) {
+			filter = new IConstraintFilter() {
+				public boolean accept(IConstraintDescriptor constraint, EObject target) {
+					return constraint.getId().equals(getConstraintID());
+				}
+			};
+
+			validator.addConstraintFilter(filter);
+		}
+	}
+
+	protected abstract String getConstraintID();
+
+}
\ No newline at end of file
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/AbstractIdentifiableLongNameConstraintTests.java b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/AbstractIdentifiableLongNameConstraintTests.java
new file mode 100644
index 0000000..d0a0805
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/AbstractIdentifiableLongNameConstraintTests.java
@@ -0,0 +1,71 @@
+package org.eclipse.rmf.tests.reqif10.constraints;
+
+import static org.junit.Assert.assertEquals;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.rmf.reqif10.Identifiable;
+import org.junit.Test;
+
+/**
+ * Copyright (c) 2014 itemis AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Mark Broerkens - initial API and implementation
+ * 
+ */
+@SuppressWarnings("nls")
+public abstract class AbstractIdentifiableLongNameConstraintTests extends AbstractConstraintTest {
+
+	protected abstract Identifiable createIdentifiable();
+
+	protected Identifiable createInvalidEmptyLongName() {
+		Identifiable identifiable = createIdentifiable();
+		identifiable.setLongName("");
+		return identifiable;
+	}
+
+	protected Identifiable createInvalidUnsetLongName() {
+		Identifiable identifiable = createIdentifiable();
+		return identifiable;
+	}
+
+	protected Identifiable createInvalidNullLongName() {
+		Identifiable identifiable = createIdentifiable();
+		identifiable.setLongName(null);
+		return identifiable;
+	}
+
+	protected Identifiable createValidModel() {
+		Identifiable identifiable = createIdentifiable();
+		identifiable.setLongName("Valid Long Name");
+		return identifiable;
+	}
+
+	@Test
+	public void testInvalidEmptyLongName() {
+		IStatus status = validator.validate(createInvalidEmptyLongName());
+		assertEquals(IStatus.ERROR, status.getSeverity());
+	}
+
+	@Test
+	public void testInvalidUnsetLongName() {
+		IStatus status = validator.validate(createInvalidUnsetLongName());
+		assertEquals(IStatus.ERROR, status.getSeverity());
+	}
+
+	@Test
+	public void testInvalidNullLongName() {
+		IStatus status = validator.validate(createInvalidNullLongName());
+		assertEquals(IStatus.ERROR, status.getSeverity());
+	}
+
+	@Test
+	public void testValid() {
+		IStatus status = validator.validate(createValidModel());
+		assertEquals(IStatus.OK, status.getSeverity());
+	}
+}
\ No newline at end of file
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C11_EnumValue_LongNameConstraintTests.java b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C11_EnumValue_LongNameConstraintTests.java
new file mode 100644
index 0000000..ef05afc
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C11_EnumValue_LongNameConstraintTests.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2014 itemis AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Mark Broerkens - initial API and implementation
+ * 
+ */
+package org.eclipse.rmf.tests.reqif10.constraints;
+
+import org.eclipse.rmf.reqif10.Identifiable;
+import org.eclipse.rmf.reqif10.ReqIF10Factory;
+
+@SuppressWarnings("nls")
+public class C11_EnumValue_LongNameConstraintTests extends AbstractIdentifiableLongNameConstraintTests {
+
+	@Override
+	protected String getConstraintID() {
+		return "org.eclipse.rmf.reqif10.constraints.C1.1";
+	}
+
+	@Override
+	protected Identifiable createIdentifiable() {
+		return ReqIF10Factory.eINSTANCE.createEnumValue();
+	}
+
+}
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C12_AttributeDefinitionBoolean_LongNameConstraintTests.java b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C12_AttributeDefinitionBoolean_LongNameConstraintTests.java
new file mode 100644
index 0000000..d143b54
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C12_AttributeDefinitionBoolean_LongNameConstraintTests.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2014 itemis AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Mark Broerkens - initial API and implementation
+ * 
+ */
+package org.eclipse.rmf.tests.reqif10.constraints;
+
+import org.eclipse.rmf.reqif10.Identifiable;
+import org.eclipse.rmf.reqif10.ReqIF10Factory;
+
+@SuppressWarnings("nls")
+public class C12_AttributeDefinitionBoolean_LongNameConstraintTests extends AbstractIdentifiableLongNameConstraintTests {
+
+	@Override
+	protected String getConstraintID() {
+		return "org.eclipse.rmf.reqif10.constraints.C1.2";
+	}
+
+	@Override
+	protected Identifiable createIdentifiable() {
+		return ReqIF10Factory.eINSTANCE.createAttributeDefinitionBoolean();
+	}
+
+}
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C13_AttributeDefinitionDate_LongNameConstraintTests.java b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C13_AttributeDefinitionDate_LongNameConstraintTests.java
new file mode 100644
index 0000000..92b3ab0
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C13_AttributeDefinitionDate_LongNameConstraintTests.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2014 itemis AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Mark Broerkens - initial API and implementation
+ * 
+ */
+package org.eclipse.rmf.tests.reqif10.constraints;
+
+import org.eclipse.rmf.reqif10.Identifiable;
+import org.eclipse.rmf.reqif10.ReqIF10Factory;
+
+@SuppressWarnings("nls")
+public class C13_AttributeDefinitionDate_LongNameConstraintTests extends AbstractIdentifiableLongNameConstraintTests {
+
+	@Override
+	protected String getConstraintID() {
+		return "org.eclipse.rmf.reqif10.constraints.C1.3";
+	}
+
+	@Override
+	protected Identifiable createIdentifiable() {
+		return ReqIF10Factory.eINSTANCE.createAttributeDefinitionDate();
+	}
+
+}
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C14_AttributeDefinitionEnumeration_LongNameConstraintTests.java b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C14_AttributeDefinitionEnumeration_LongNameConstraintTests.java
new file mode 100644
index 0000000..a64eb96
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C14_AttributeDefinitionEnumeration_LongNameConstraintTests.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2014 itemis AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Mark Broerkens - initial API and implementation
+ * 
+ */
+package org.eclipse.rmf.tests.reqif10.constraints;
+
+import org.eclipse.rmf.reqif10.Identifiable;
+import org.eclipse.rmf.reqif10.ReqIF10Factory;
+
+@SuppressWarnings("nls")
+public class C14_AttributeDefinitionEnumeration_LongNameConstraintTests extends AbstractIdentifiableLongNameConstraintTests {
+
+	@Override
+	protected String getConstraintID() {
+		return "org.eclipse.rmf.reqif10.constraints.C1.4";
+	}
+
+	@Override
+	protected Identifiable createIdentifiable() {
+		return ReqIF10Factory.eINSTANCE.createAttributeDefinitionEnumeration();
+	}
+
+}
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C15_AttributeDefinitionInteger_LongNameConstraintTests.java b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C15_AttributeDefinitionInteger_LongNameConstraintTests.java
new file mode 100644
index 0000000..fbb9ffb
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C15_AttributeDefinitionInteger_LongNameConstraintTests.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2014 itemis AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Mark Broerkens - initial API and implementation
+ * 
+ */
+package org.eclipse.rmf.tests.reqif10.constraints;
+
+import org.eclipse.rmf.reqif10.Identifiable;
+import org.eclipse.rmf.reqif10.ReqIF10Factory;
+
+@SuppressWarnings("nls")
+public class C15_AttributeDefinitionInteger_LongNameConstraintTests extends AbstractIdentifiableLongNameConstraintTests {
+
+	@Override
+	protected String getConstraintID() {
+		return "org.eclipse.rmf.reqif10.constraints.C1.5";
+	}
+
+	@Override
+	protected Identifiable createIdentifiable() {
+		return ReqIF10Factory.eINSTANCE.createAttributeDefinitionInteger();
+	}
+
+}
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C16_AttributeDefinitionReal_LongNameConstraintTests.java b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C16_AttributeDefinitionReal_LongNameConstraintTests.java
new file mode 100644
index 0000000..738945b
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C16_AttributeDefinitionReal_LongNameConstraintTests.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2014 itemis AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Mark Broerkens - initial API and implementation
+ * 
+ */
+package org.eclipse.rmf.tests.reqif10.constraints;
+
+import org.eclipse.rmf.reqif10.Identifiable;
+import org.eclipse.rmf.reqif10.ReqIF10Factory;
+
+@SuppressWarnings("nls")
+public class C16_AttributeDefinitionReal_LongNameConstraintTests extends AbstractIdentifiableLongNameConstraintTests {
+
+	@Override
+	protected String getConstraintID() {
+		return "org.eclipse.rmf.reqif10.constraints.C1.6";
+	}
+
+	@Override
+	protected Identifiable createIdentifiable() {
+		return ReqIF10Factory.eINSTANCE.createAttributeDefinitionReal();
+	}
+
+}
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C17_AttributeDefinitionString_LongNameConstraintTests.java b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C17_AttributeDefinitionString_LongNameConstraintTests.java
new file mode 100644
index 0000000..9ed960a
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C17_AttributeDefinitionString_LongNameConstraintTests.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2014 itemis AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Mark Broerkens - initial API and implementation
+ * 
+ */
+package org.eclipse.rmf.tests.reqif10.constraints;
+
+import org.eclipse.rmf.reqif10.Identifiable;
+import org.eclipse.rmf.reqif10.ReqIF10Factory;
+
+@SuppressWarnings("nls")
+public class C17_AttributeDefinitionString_LongNameConstraintTests extends AbstractIdentifiableLongNameConstraintTests {
+
+	@Override
+	protected String getConstraintID() {
+		return "org.eclipse.rmf.reqif10.constraints.C1.7";
+	}
+
+	@Override
+	protected Identifiable createIdentifiable() {
+		return ReqIF10Factory.eINSTANCE.createAttributeDefinitionString();
+	}
+
+}
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C18_AttributeDefinitionXHTML_LongNameConstraintTests.java b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C18_AttributeDefinitionXHTML_LongNameConstraintTests.java
new file mode 100644
index 0000000..f18f696
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C18_AttributeDefinitionXHTML_LongNameConstraintTests.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2014 itemis AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Mark Broerkens - initial API and implementation
+ * 
+ */
+package org.eclipse.rmf.tests.reqif10.constraints;
+
+import org.eclipse.rmf.reqif10.Identifiable;
+import org.eclipse.rmf.reqif10.ReqIF10Factory;
+
+@SuppressWarnings("nls")
+public class C18_AttributeDefinitionXHTML_LongNameConstraintTests extends AbstractIdentifiableLongNameConstraintTests {
+
+	@Override
+	protected String getConstraintID() {
+		return "org.eclipse.rmf.reqif10.constraints.C1.8";
+	}
+
+	@Override
+	protected Identifiable createIdentifiable() {
+		return ReqIF10Factory.eINSTANCE.createAttributeDefinitionXHTML();
+	}
+
+}
diff --git a/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C19_ReleationGroup_LongNameConstraintTests.java b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C19_ReleationGroup_LongNameConstraintTests.java
new file mode 100644
index 0000000..ef11370
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.constraints/src/org/eclipse/rmf/tests/reqif10/constraints/C19_ReleationGroup_LongNameConstraintTests.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2014 itemis AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Mark Broerkens - initial API and implementation
+ * 
+ */
+package org.eclipse.rmf.tests.reqif10.constraints;
+
+import org.eclipse.rmf.reqif10.Identifiable;
+import org.eclipse.rmf.reqif10.ReqIF10Factory;
+
+@SuppressWarnings("nls")
+public class C19_ReleationGroup_LongNameConstraintTests extends AbstractIdentifiableLongNameConstraintTests {
+
+	@Override
+	protected String getConstraintID() {
+		return "org.eclipse.rmf.reqif10.constraints.C1.9";
+	}
+
+	@Override
+	protected Identifiable createIdentifiable() {
+		return ReqIF10Factory.eINSTANCE.createRelationGroup();
+	}
+
+}
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.classpath b/org.eclipse.rmf.tests.reqif10.excel.serialization/.classpath
similarity index 99%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/.classpath
copy to org.eclipse.rmf.tests.reqif10.excel.serialization/.classpath
index 304e861..64c5e31 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.classpath
+++ b/org.eclipse.rmf.tests.reqif10.excel.serialization/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.rmf.tests.reqif10.excel.serialization/.gitignore b/org.eclipse.rmf.tests.reqif10.excel.serialization/.gitignore
new file mode 100644
index 0000000..a0372f8
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.excel.serialization/.gitignore
@@ -0,0 +1,3 @@
+/bin
+/working-dir
+/target
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.project b/org.eclipse.rmf.tests.reqif10.excel.serialization/.project
similarity index 90%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/.project
copy to org.eclipse.rmf.tests.reqif10.excel.serialization/.project
index 0032b4b..c9e28ec 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/.project
+++ b/org.eclipse.rmf.tests.reqif10.excel.serialization/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.rmf.reqif10.pror.presentation.id.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.rmf.tests.reqif10.excel.serialization</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.rmf.tests.reqif10.excel.serialization/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.rmf.tests.reqif10.excel.serialization/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..af0f20f
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.excel.serialization/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.rmf.tests.reqif10.excel.serialization/META-INF/MANIFEST.MF b/org.eclipse.rmf.tests.reqif10.excel.serialization/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..dc24afa
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.excel.serialization/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.rmf.tests.reqif10.excel.serialization
+Bundle-Version: 0.10.0.qualifier
+Bundle-Vendor: %providerName
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.rmf.reqif10.excel.serialization;bundle-version="0.8.0",
+ org.junit,
+ org.eclipse.emf;bundle-version="2.6.0",
+ org.eclipse.emf.ecore;bundle-version="2.7.0"
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html b/org.eclipse.rmf.tests.reqif10.excel.serialization/about.html
similarity index 99%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
copy to org.eclipse.rmf.tests.reqif10.excel.serialization/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
+++ b/org.eclipse.rmf.tests.reqif10.excel.serialization/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.tests.reqif10.excel.serialization/build.properties b/org.eclipse.rmf.tests.reqif10.excel.serialization/build.properties
new file mode 100644
index 0000000..af022dd
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.excel.serialization/build.properties
@@ -0,0 +1,17 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               epl-v10.html,\
+               notice.html
diff --git a/org.eclipse.rmf.examples.feature/epl-v10.html b/org.eclipse.rmf.tests.reqif10.excel.serialization/epl-v10.html
similarity index 99%
copy from org.eclipse.rmf.examples.feature/epl-v10.html
copy to org.eclipse.rmf.tests.reqif10.excel.serialization/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.examples.feature/epl-v10.html
+++ b/org.eclipse.rmf.tests.reqif10.excel.serialization/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/notice.html b/org.eclipse.rmf.tests.reqif10.excel.serialization/notice.html
similarity index 97%
copy from org.eclipse.rmf.examples.feature/notice.html
copy to org.eclipse.rmf.tests.reqif10.excel.serialization/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.examples.feature/notice.html
+++ b/org.eclipse.rmf.tests.reqif10.excel.serialization/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.tests.reqif10.excel.serialization/resources/inputs/empty.xls b/org.eclipse.rmf.tests.reqif10.excel.serialization/resources/inputs/empty.xls
new file mode 100644
index 0000000..7167ded
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.excel.serialization/resources/inputs/empty.xls
Binary files differ
diff --git a/org.eclipse.rmf.tests.reqif10.excel.serialization/resources/inputs/empty.xlsx b/org.eclipse.rmf.tests.reqif10.excel.serialization/resources/inputs/empty.xlsx
new file mode 100644
index 0000000..61ade19
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.excel.serialization/resources/inputs/empty.xlsx
Binary files differ
diff --git a/org.eclipse.rmf.tests.reqif10.excel.serialization/src/org/eclipse/rmf/tests/reqif10/excel/serialization/ExcelResourceImplLoadTests.java b/org.eclipse.rmf.tests.reqif10.excel.serialization/src/org/eclipse/rmf/tests/reqif10/excel/serialization/ExcelResourceImplLoadTests.java
new file mode 100644
index 0000000..37b1b07
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.excel.serialization/src/org/eclipse/rmf/tests/reqif10/excel/serialization/ExcelResourceImplLoadTests.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.rmf.tests.reqif10.excel.serialization;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.rmf.reqif10.excel.serialization.ExcelResourceImpl;
+import org.junit.Test;
+
+public class ExcelResourceImplLoadTests {
+
+	@Test
+	public void testLoad() throws IOException {
+		URI emfURI = URI.createURI("resources/inputs/empty.xls");
+		Resource excelResource = new ExcelResourceImpl(emfURI);
+		excelResource.load(null);
+	}
+
+}
diff --git a/org.eclipse.rmf.tests.reqif10.excel.serialization/src/org/eclipse/rmf/tests/reqif10/excel/serialization/ExcelResourceImplSaveTests.java b/org.eclipse.rmf.tests.reqif10.excel.serialization/src/org/eclipse/rmf/tests/reqif10/excel/serialization/ExcelResourceImplSaveTests.java
new file mode 100644
index 0000000..ec57128
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.excel.serialization/src/org/eclipse/rmf/tests/reqif10/excel/serialization/ExcelResourceImplSaveTests.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.rmf.tests.reqif10.excel.serialization;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.rmf.reqif10.excel.serialization.ExcelResourceImpl;
+import org.junit.Test;
+
+public class ExcelResourceImplSaveTests {
+
+	@Test
+	public void testSave() throws IOException {
+		URI emfURI = URI.createURI("working-dir/empty.xls");
+		Resource excelResource = new ExcelResourceImpl(emfURI);
+		excelResource.save(null);
+	}
+
+}
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html b/org.eclipse.rmf.tests.reqif10.feature/about.html
similarity index 99%
copy from org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
copy to org.eclipse.rmf.tests.reqif10.feature/about.html
index f47dbdd..c258ef5 100644
--- a/org.eclipse.rmf.reqif10.pror.presentation.id.tests/about.html
+++ b/org.eclipse.rmf.tests.reqif10.feature/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2006</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.tests.reqif10.feature/build.properties b/org.eclipse.rmf.tests.reqif10.feature/build.properties
index 64f93a9..7b35999 100644
--- a/org.eclipse.rmf.tests.reqif10.feature/build.properties
+++ b/org.eclipse.rmf.tests.reqif10.feature/build.properties
@@ -1 +1,12 @@
-bin.includes = feature.xml
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties
\ No newline at end of file
diff --git a/org.eclipse.rmf.examples.feature/epl-v10.html b/org.eclipse.rmf.tests.reqif10.feature/epl-v10.html
similarity index 99%
copy from org.eclipse.rmf.examples.feature/epl-v10.html
copy to org.eclipse.rmf.tests.reqif10.feature/epl-v10.html
index 813c07d..3998fce 100644
--- a/org.eclipse.rmf.examples.feature/epl-v10.html
+++ b/org.eclipse.rmf.tests.reqif10.feature/epl-v10.html
@@ -1,261 +1,261 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Public License - Version 1.0</title>

-<style type="text/css">

-  body {

-    size: 8.5in 11.0in;

-    margin: 0.25in 0.5in 0.25in 0.5in;

-    tab-interval: 0.5in;

-    }

-  p {  	

-    margin-left: auto;

-    margin-top:  0.5em;

-    margin-bottom: 0.5em;

-    }

-  p.list {

-  	margin-left: 0.5in;

-    margin-top:  0.05em;

-    margin-bottom: 0.05em;

-    }

-  </style>

-

-</head>

-

-<body lang="EN-US">

-

-<p align=center><b>Eclipse Public License - v 1.0</b></p>

-

-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

-AGREEMENT.</p>

-

-<p><b>1. DEFINITIONS</b></p>

-

-<p>&quot;Contribution&quot; means:</p>

-

-<p class="list">a) in the case of the initial Contributor, the initial

-code and documentation distributed under this Agreement, and</p>

-<p class="list">b) in the case of each subsequent Contributor:</p>

-<p class="list">i) changes to the Program, and</p>

-<p class="list">ii) additions to the Program;</p>

-<p class="list">where such changes and/or additions to the Program

-originate from and are distributed by that particular Contributor. A

-Contribution 'originates' from a Contributor if it was added to the

-Program by such Contributor itself or anyone acting on such

-Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in

-conjunction with the Program under their own license agreement, and (ii)

-are not derivative works of the Program.</p>

-

-<p>&quot;Contributor&quot; means any person or entity that distributes

-the Program.</p>

-

-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

-Contributor which are necessarily infringed by the use or sale of its

-Contribution alone or when combined with the Program.</p>

-

-<p>&quot;Program&quot; means the Contributions distributed in accordance

-with this Agreement.</p>

-

-<p>&quot;Recipient&quot; means anyone who receives the Program under

-this Agreement, including all Contributors.</p>

-

-<p><b>2. GRANT OF RIGHTS</b></p>

-

-<p class="list">a) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free copyright license to reproduce, prepare derivative works

-of, publicly display, publicly perform, distribute and sublicense the

-Contribution of such Contributor, if any, and such derivative works, in

-source code and object code form.</p>

-

-<p class="list">b) Subject to the terms of this Agreement, each

-Contributor hereby grants Recipient a non-exclusive, worldwide,

-royalty-free patent license under Licensed Patents to make, use, sell,

-offer to sell, import and otherwise transfer the Contribution of such

-Contributor, if any, in source code and object code form. This patent

-license shall apply to the combination of the Contribution and the

-Program if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to be covered

-by the Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.</p>

-

-<p class="list">c) Recipient understands that although each Contributor

-grants the licenses to its Contributions set forth herein, no assurances

-are provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility to

-secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow Recipient

-to distribute the Program, it is Recipient's responsibility to acquire

-that license before distributing the Program.</p>

-

-<p class="list">d) Each Contributor represents that to its knowledge it

-has sufficient copyright rights in its Contribution, if any, to grant

-the copyright license set forth in this Agreement.</p>

-

-<p><b>3. REQUIREMENTS</b></p>

-

-<p>A Contributor may choose to distribute the Program in object code

-form under its own license agreement, provided that:</p>

-

-<p class="list">a) it complies with the terms and conditions of this

-Agreement; and</p>

-

-<p class="list">b) its license agreement:</p>

-

-<p class="list">i) effectively disclaims on behalf of all Contributors

-all warranties and conditions, express and implied, including warranties

-or conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;</p>

-

-<p class="list">ii) effectively excludes on behalf of all Contributors

-all liability for damages, including direct, indirect, special,

-incidental and consequential damages, such as lost profits;</p>

-

-<p class="list">iii) states that any provisions which differ from this

-Agreement are offered by that Contributor alone and not by any other

-party; and</p>

-

-<p class="list">iv) states that source code for the Program is available

-from such Contributor, and informs licensees how to obtain it in a

-reasonable manner on or through a medium customarily used for software

-exchange.</p>

-

-<p>When the Program is made available in source code form:</p>

-

-<p class="list">a) it must be made available under this Agreement; and</p>

-

-<p class="list">b) a copy of this Agreement must be included with each

-copy of the Program.</p>

-

-<p>Contributors may not remove or alter any copyright notices contained

-within the Program.</p>

-

-<p>Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.</p>

-

-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

-

-<p>Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use of

-the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create

-potential liability for other Contributors. Therefore, if a Contributor

-includes the Program in a commercial product offering, such Contributor

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and

-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

-against any losses, damages and costs (collectively &quot;Losses&quot;)

-arising from claims, lawsuits and other legal actions brought by a third

-party against the Indemnified Contributor to the extent caused by the

-acts or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In

-order to qualify, an Indemnified Contributor must: a) promptly notify

-the Commercial Contributor in writing of such claim, and b) allow the

-Commercial Contributor to control, and cooperate with the Commercial

-Contributor in, the defense and any related settlement negotiations. The

-Indemnified Contributor may participate in any such claim at its own

-expense.</p>

-

-<p>For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.</p>

-

-<p><b>5. NO WARRANTY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable laws,

-damage to or loss of data, programs or equipment, and unavailability or

-interruption of operations.</p>

-

-<p><b>6. DISCLAIMER OF LIABILITY</b></p>

-

-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

-

-<p><b>7. GENERAL</b></p>

-

-<p>If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further action

-by the parties hereto, such provision shall be reformed to the minimum

-extent necessary to make such provision valid and enforceable.</p>

-

-<p>If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the

-date such litigation is filed.</p>

-

-<p>All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of time

-after becoming aware of such noncompliance. If all Recipient's rights

-under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive.</p>

-

-<p>Everyone is permitted to copy and distribute copies of this

-Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The

-Agreement Steward reserves the right to publish new versions (including

-revisions) of this Agreement from time to time. No one other than the

-Agreement Steward has the right to modify this Agreement. The Eclipse

-Foundation is the initial Agreement Steward. The Eclipse Foundation may

-assign the responsibility to serve as the Agreement Steward to a

-suitable separate entity. Each new version of the Agreement will be

-given a distinguishing version number. The Program (including

-Contributions) may always be distributed subject to the version of the

-Agreement under which it was received. In addition, after a new version

-of the Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

-rights or licenses to the intellectual property of any Contributor under

-this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.</p>

-

-<p>This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No party

-to this Agreement will bring a legal action under this Agreement more

-than one year after the cause of action arose. Each party waives its

-rights to a jury trial in any resulting litigation.</p>

-

-</body>

-

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.tests.reqif10.feature/feature.properties b/org.eclipse.rmf.tests.reqif10.feature/feature.properties
new file mode 100644
index 0000000..c2ee239
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.feature/feature.properties
@@ -0,0 +1,32 @@
+###############################################################################

+# Copyright (c) 2014 itemis AG and others.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     Mark Broerkens (itemis AG) - initial API and implementation

+###############################################################################

+# feature.properties

+# contains externalized strings for feature.xml

+# "%foo" in feature.xml corresponds to the key "foo" in this file

+# java.io.Properties file (ISO 8859-1 with "\\" escapes)

+# This file should be translated.

+

+# "featureName" property - name of the feature

+featureName=RMF Core ReqIF Feature (Incubation)

+

+# "providerName" property - name of the company that provides the feature

+providerName=Eclipse Modeling Project

+

+# "updateSiteName" property - label for the update site

+

+# "description" property - description of the feature

+description=An EMF-based implementation of ReqIf 1.0.1

+

+# "copyright" property - text of the "Feature Update Copyright"

+

+

+

+

diff --git a/org.eclipse.rmf.tests.reqif10.feature/feature.xml b/org.eclipse.rmf.tests.reqif10.feature/feature.xml
index e6099a3..dcc735d 100644
--- a/org.eclipse.rmf.tests.reqif10.feature/feature.xml
+++ b/org.eclipse.rmf.tests.reqif10.feature/feature.xml
@@ -1,19 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.rmf.tests.reqif10.feature"
-      label="Feature"
-      version="0.9.0.qualifier">
+      label="%featureName"
+      version="0.10.0.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.1.qualifier">
 
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
+   <description url="http://www.eclipse.org/rmf">
+      %description
    </description>
 
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
+   <copyright url="http://itemis.com/">
+      Copyright (c) 2013 itemis AG and others.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+Contributors:
+Mark Broerkens - initial API and implementation
    </copyright>
 
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
+   <license url="%licenseURL">
+      %license
    </license>
 
    <requires>
@@ -40,4 +50,10 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.rmf.tests.reqif10.constraints"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>
diff --git a/org.eclipse.rmf.examples.feature/notice.html b/org.eclipse.rmf.tests.reqif10.feature/notice.html
similarity index 97%
copy from org.eclipse.rmf.examples.feature/notice.html
copy to org.eclipse.rmf.tests.reqif10.feature/notice.html
index 5ef6811..c3d34c3 100644
--- a/org.eclipse.rmf.examples.feature/notice.html
+++ b/org.eclipse.rmf.tests.reqif10.feature/notice.html
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

-<title>Eclipse Foundation Software User Agreement</title>

-</head>

-

-<body lang="EN-US">

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>February 1, 2011</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-

-<h3>Applicable Licenses</h3>

-

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-

-<ul>

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>

-

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-       <li>The top-level (root) directory</li>

-       <li>Plug-in and Fragment directories</li>

-       <li>Inside Plug-ins and Fragments packaged as JARs</li>

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-       <li>Feature directories</li>

-</ul>

-

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-

-<h3>Use of Provisioning Technology</h3>

-

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

-   (&quot;Specification&quot;).</p>

-

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

-

-<ol>

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li>

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li>

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

-</ol>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

-</body>

-</html>

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.rmf.tests.reqif10.feature/pom.xml b/org.eclipse.rmf.tests.reqif10.feature/pom.xml
index 44aa702..14c0d93 100644
--- a/org.eclipse.rmf.tests.reqif10.feature/pom.xml
+++ b/org.eclipse.rmf.tests.reqif10.feature/pom.xml
@@ -6,11 +6,10 @@
 	<parent>
 		<groupId>org.eclipse.rmf</groupId>
 		<artifactId>org.eclipse.rmf.releng</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.10.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.rmf.tests.reqif10.feature</artifactId>
-	<version>0.9.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	<groupId>org.eclipse.rmf.features</groupId>
 </project>
\ No newline at end of file
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/.classpath b/org.eclipse.rmf.tests.reqif10.serialization/.classpath
index 485c7c9..27bd7bd 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/.classpath
+++ b/org.eclipse.rmf.tests.reqif10.serialization/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.rmf.tests.reqif10.serialization/.settings/org.eclipse.jdt.core.prefs
index 54de855..180cb17 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.rmf.tests.reqif10.serialization/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Thu Apr 12 17:16:42 CEST 2012

 eclipse.preferences.version=1

 org.eclipse.jdt.core.codeComplete.argumentPrefixes=

 org.eclipse.jdt.core.codeComplete.argumentSuffixes=

@@ -11,9 +10,9 @@
 org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=

 org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.compliance=1.7

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

@@ -89,7 +88,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

-org.eclipse.jdt.core.compiler.source=1.5

+org.eclipse.jdt.core.compiler.source=1.7

 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

diff --git a/org.eclipse.rmf.tests.reqif10.serialization/META-INF/MANIFEST.MF b/org.eclipse.rmf.tests.reqif10.serialization/META-INF/MANIFEST.MF
index 1cdde0a..10ed6a1 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.tests.reqif10.serialization/META-INF/MANIFEST.MF
@@ -2,37 +2,35 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rmf.tests.reqif10.serialization
-Bundle-Version: 0.9.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Version: 0.10.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.junit,
  org.eclipse.core.runtime,
  org.eclipse.rmf.reqif10.xhtml,
  org.eclipse.rmf.reqif10;bundle-version="0.9.0",
  org.eclipse.rmf.reqif10.serialization;bundle-version="0.9.0",
- org.eclipse.rmf.serialization;bundle-version="0.9.0"
+ org.eclipse.rmf.serialization;bundle-version="0.9.0",
+ org.eclipse.rmf.reqif10.common;bundle-version="0.10.0"
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.rmf.tests.reqif10.serialization.model.toolextension,
- org.eclipse.rmf.tests.reqif10.serialization.model.toolextension.impl,
- org.eclipse.rmf.tests.reqif10.serialization.model.toolextension.util,
- org.eclipse.rmf.tests.reqif10.serialization.referencedata,
- org.eclipse.rmf.tests.reqif10.serialization.uc000.tc1000,
- org.eclipse.rmf.tests.reqif10.serialization.uc000.tc1001,
- org.eclipse.rmf.tests.reqif10.serialization.uc000.tc1002,
- org.eclipse.rmf.tests.reqif10.serialization.uc000.tc4000,
- org.eclipse.rmf.tests.reqif10.serialization.uc000.tc4001,
- org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1000,
- org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1100,
- org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1200,
- org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1250,
- org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1250.testdata,
- org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1300,
- org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1400,
- org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1500,
- org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1600,
- org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1700,
- org.eclipse.rmf.tests.reqif10.serialization.uc001.tc3000,
- org.eclipse.rmf.tests.reqif10.serialization.uc001.tc4000,
- org.eclipse.rmf.tests.reqif10.serialization.uc002,
- org.eclipse.rmf.tests.reqif10.serialization.uc003.tc18xx,
- org.eclipse.rmf.tests.reqif10.serialization.util
+Export-Package: org.eclipse.rmf.tests.reqif10.serialization.model.tool
+ extension,org.eclipse.rmf.tests.reqif10.serialization.model.toolexten
+ sion.impl,org.eclipse.rmf.tests.reqif10.serialization.model.toolexten
+ sion.util,org.eclipse.rmf.tests.reqif10.serialization.referencedata,o
+ rg.eclipse.rmf.tests.reqif10.serialization.uc000.tc1000,org.eclipse.r
+ mf.tests.reqif10.serialization.uc000.tc1001,org.eclipse.rmf.tests.req
+ if10.serialization.uc000.tc1002,org.eclipse.rmf.tests.reqif10.seriali
+ zation.uc000.tc4000,org.eclipse.rmf.tests.reqif10.serialization.uc000
+ .tc4001,org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1000,org.
+ eclipse.rmf.tests.reqif10.serialization.uc001.tc1100,org.eclipse.rmf.
+ tests.reqif10.serialization.uc001.tc1200,org.eclipse.rmf.tests.reqif1
+ 0.serialization.uc001.tc1250,org.eclipse.rmf.tests.reqif10.serializat
+ ion.uc001.tc1250.testdata,org.eclipse.rmf.tests.reqif10.serialization
+ .uc001.tc1300,org.eclipse.rmf.tests.reqif10.serialization.uc001.tc140
+ 0,org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1500,org.eclips
+ e.rmf.tests.reqif10.serialization.uc001.tc1600,org.eclipse.rmf.tests.
+ reqif10.serialization.uc001.tc1700,org.eclipse.rmf.tests.reqif10.seri
+ alization.uc001.tc3000,org.eclipse.rmf.tests.reqif10.serialization.uc
+ 001.tc4000,org.eclipse.rmf.tests.reqif10.serialization.uc002,org.ecli
+ pse.rmf.tests.reqif10.serialization.uc003.tc18xx,org.eclipse.rmf.test
+ s.reqif10.serialization.util
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/build.properties b/org.eclipse.rmf.tests.reqif10.serialization/build.properties
index 24bf9d2..9cf5333 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/build.properties
+++ b/org.eclipse.rmf.tests.reqif10.serialization/build.properties
@@ -1,3 +1,13 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 source.. = src/,\
            src-gen/
 output.. = bin/
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/epl-v10.html b/org.eclipse.rmf.tests.reqif10.serialization/epl-v10.html
index 84ec251..3998fce 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/epl-v10.html
+++ b/org.eclipse.rmf.tests.reqif10.serialization/epl-v10.html
@@ -27,7 +27,7 @@
 
 <body lang="EN-US">
 
-<p align=center><b>Eclipse Public License - v 1.0</b></p>
+<h2>Eclipse Public License - v 1.0</h2>
 
 <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
 PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
@@ -258,4 +258,4 @@
 
 </body>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/launch/JUnit Plugin Test - org.eclipse.rmf.tests.serialization.reqif10.launch b/org.eclipse.rmf.tests.reqif10.serialization/launch/JUnit Plugin Test - org.eclipse.rmf.tests.serialization.reqif10.launch
index e418d40..e3e9fd9 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/launch/JUnit Plugin Test - org.eclipse.rmf.tests.serialization.reqif10.launch
+++ b/org.eclipse.rmf.tests.reqif10.serialization/launch/JUnit Plugin Test - org.eclipse.rmf.tests.serialization.reqif10.launch
@@ -28,7 +28,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.rmf.tests.reqif10.serialization"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xmx512m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xmx4000m"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.equinox.p2.director.app.product"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/launch/JUnit Test - org.eclipse.rmf.tests.serialization.reqif10.launch b/org.eclipse.rmf.tests.reqif10.serialization/launch/JUnit Test - org.eclipse.rmf.tests.serialization.reqif10.launch
index 1f0ddb1..a3ffcd5 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/launch/JUnit Test - org.eclipse.rmf.tests.serialization.reqif10.launch
+++ b/org.eclipse.rmf.tests.reqif10.serialization/launch/JUnit Test - org.eclipse.rmf.tests.serialization.reqif10.launch
@@ -12,5 +12,5 @@
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.rmf.tests.reqif10.serialization"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xmx512m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xmx4000m"/>
 </launchConfiguration>
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/notice.html b/org.eclipse.rmf.tests.reqif10.serialization/notice.html
index f19c483..c3d34c3 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/notice.html
+++ b/org.eclipse.rmf.tests.reqif10.serialization/notice.html
@@ -8,7 +8,7 @@
 
 <body lang="EN-US">
 <h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
+<p>April 9, 2014</p>
 
 <h3>Usage Of Content</h3>
 
@@ -62,7 +62,6 @@
        <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
        <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
        <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
        <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
 </ul>
 
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/plugin.properties b/org.eclipse.rmf.tests.reqif10.serialization/plugin.properties
index b9b3299..2ccbe5a 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/plugin.properties
+++ b/org.eclipse.rmf.tests.reqif10.serialization/plugin.properties
@@ -1,11 +1,13 @@
-# Copyright (c) 2013 itemis AG.
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # Contributors:
-#     Mark Broerkens - initial API and implementation
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 
 pluginName = RMF ReqIF Serialization Tests (Incubation)
 providerName = Eclipse Modeling Project
\ No newline at end of file
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/pom.xml b/org.eclipse.rmf.tests.reqif10.serialization/pom.xml
index cb53bac..93c5d2b 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/pom.xml
+++ b/org.eclipse.rmf.tests.reqif10.serialization/pom.xml
@@ -19,12 +19,11 @@
 	<parent>
 		<groupId>org.eclipse.rmf</groupId>
 		<artifactId>org.eclipse.rmf.releng</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.10.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.rmf.plugins</groupId>
 	<artifactId>org.eclipse.rmf.tests.reqif10.serialization</artifactId>
-	<version>0.9.0-SNAPSHOT</version>
 	<properties>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   	</properties>
@@ -60,7 +59,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<includes>
 						<include>**/*Tests.class</include>
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/Extension.java b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/Extension.java
index 49b60f0..471a40d 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/Extension.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/Extension.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 /**
  */
 package org.eclipse.rmf.tests.reqif10.serialization.model.toolextension;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/SpecObjectExtension.java b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/SpecObjectExtension.java
index 16d1417..aa2d82a 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/SpecObjectExtension.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/SpecObjectExtension.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 /**
  */
 package org.eclipse.rmf.tests.reqif10.serialization.model.toolextension;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/ToolextensionFactory.java b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/ToolextensionFactory.java
index e6e3056..0f69d64 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/ToolextensionFactory.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/ToolextensionFactory.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 /**
  */
 package org.eclipse.rmf.tests.reqif10.serialization.model.toolextension;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/ToolextensionPackage.java b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/ToolextensionPackage.java
index f1a5ed9..911efcc 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/ToolextensionPackage.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/ToolextensionPackage.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 /**
  */
 package org.eclipse.rmf.tests.reqif10.serialization.model.toolextension;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/impl/ExtensionImpl.java b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/impl/ExtensionImpl.java
index 40de424..66e3b27 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/impl/ExtensionImpl.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/impl/ExtensionImpl.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 /**
  */
 package org.eclipse.rmf.tests.reqif10.serialization.model.toolextension.impl;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/impl/SpecObjectExtensionImpl.java b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/impl/SpecObjectExtensionImpl.java
index 539b2b5..c09791a 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/impl/SpecObjectExtensionImpl.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/impl/SpecObjectExtensionImpl.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 /**
  */
 package org.eclipse.rmf.tests.reqif10.serialization.model.toolextension.impl;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/impl/ToolextensionFactoryImpl.java b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/impl/ToolextensionFactoryImpl.java
index 9343b56..953af55 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/impl/ToolextensionFactoryImpl.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/impl/ToolextensionFactoryImpl.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 /**
  */
 package org.eclipse.rmf.tests.reqif10.serialization.model.toolextension.impl;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/impl/ToolextensionPackageImpl.java b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/impl/ToolextensionPackageImpl.java
index 92c6e3b..9199a70 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/impl/ToolextensionPackageImpl.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/impl/ToolextensionPackageImpl.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 /**
  */
 package org.eclipse.rmf.tests.reqif10.serialization.model.toolextension.impl;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionAdapterFactory.java b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionAdapterFactory.java
index 25ae388..581346c 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionAdapterFactory.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionAdapterFactory.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 /**
  */
 package org.eclipse.rmf.tests.reqif10.serialization.model.toolextension.util;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionResourceFactoryImpl.java b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionResourceFactoryImpl.java
index 87728c2..70eb869 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionResourceFactoryImpl.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionResourceFactoryImpl.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 /**
  */
 package org.eclipse.rmf.tests.reqif10.serialization.model.toolextension.util;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionResourceImpl.java b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionResourceImpl.java
index a30c6f5..0b9bac2 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionResourceImpl.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionResourceImpl.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 /**
  */
 package org.eclipse.rmf.tests.reqif10.serialization.model.toolextension.util;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionSwitch.java b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionSwitch.java
index 1e3191e..a8fb27c 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionSwitch.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionSwitch.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 /**
  */
 package org.eclipse.rmf.tests.reqif10.serialization.model.toolextension.util;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionXMLProcessor.java b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionXMLProcessor.java
index 9d42088..a33ef72 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionXMLProcessor.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src-gen/org/eclipse/rmf/tests/reqif10/serialization/model/toolextension/util/ToolextensionXMLProcessor.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 /**
  */
 package org.eclipse.rmf.tests.reqif10.serialization.model.toolextension.util;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/referencedata/ReferenceDataTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/referencedata/ReferenceDataTests.java
index 7379026..a5d21af 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/referencedata/ReferenceDataTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/referencedata/ReferenceDataTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.referencedata;
 
 import static org.junit.Assert.assertFalse;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1000/TC0001000ContainmentEStructuralFeatureModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1000/TC0001000ContainmentEStructuralFeatureModelBuilder.java
index 096997c..16775ac 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1000/TC0001000ContainmentEStructuralFeatureModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1000/TC0001000ContainmentEStructuralFeatureModelBuilder.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc000.tc1000;
 
 import org.eclipse.emf.common.util.EList;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1000/TC0001000ContainmentEStructuralFeatureTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1000/TC0001000ContainmentEStructuralFeatureTests.java
index cbc8899..072e07d 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1000/TC0001000ContainmentEStructuralFeatureTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1000/TC0001000ContainmentEStructuralFeatureTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc000.tc1000;
 
 import static org.junit.Assert.assertEquals;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1001/TC0001001FullModelModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1001/TC0001001FullModelModelBuilder.java
index b2d2d31..4c54dd0 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1001/TC0001001FullModelModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1001/TC0001001FullModelModelBuilder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1001/TC0001001FullModelTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1001/TC0001001FullModelTests.java
index 3a40a30..ef1ec32 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1001/TC0001001FullModelTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1001/TC0001001FullModelTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1002/TC0001002XhtmlModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1002/TC0001002XhtmlModelBuilder.java
index 6354e07..7b7936a 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1002/TC0001002XhtmlModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1002/TC0001002XhtmlModelBuilder.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc000.tc1002;
 
 import org.eclipse.emf.common.util.EList;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1002/TC0001002XhtmlTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1002/TC0001002XhtmlTests.java
index f95fa2c..b9beea6 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1002/TC0001002XhtmlTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc1002/TC0001002XhtmlTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc000.tc1002;
 
 import static org.junit.Assert.assertEquals;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc4000/TC0004000ToolExtensionWithEcoreMetamodelModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc4000/TC0004000ToolExtensionWithEcoreMetamodelModelBuilder.java
index 8156e4c..a86d43f 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc4000/TC0004000ToolExtensionWithEcoreMetamodelModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc4000/TC0004000ToolExtensionWithEcoreMetamodelModelBuilder.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc000.tc4000;
 
 import org.eclipse.emf.ecore.EAttribute;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc4000/TC0004000ToolExtensionWithEcoreMetamodelTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc4000/TC0004000ToolExtensionWithEcoreMetamodelTests.java
index 72d5b32..44f8a47 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc4000/TC0004000ToolExtensionWithEcoreMetamodelTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc4000/TC0004000ToolExtensionWithEcoreMetamodelTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc000.tc4000;
 
 import static org.junit.Assert.assertFalse;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc4001/TC0004001ToolExtensionWithCustomRuntimeCreatedMetamodelModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc4001/TC0004001ToolExtensionWithCustomRuntimeCreatedMetamodelModelBuilder.java
index f599ca0..f28410b 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc4001/TC0004001ToolExtensionWithCustomRuntimeCreatedMetamodelModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc4001/TC0004001ToolExtensionWithCustomRuntimeCreatedMetamodelModelBuilder.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc000.tc4001;
 
 import org.eclipse.emf.common.util.EList;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc4001/TC0004001ToolExtensionWithCustomRuntimeCreatedMetamodelTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc4001/TC0004001ToolExtensionWithCustomRuntimeCreatedMetamodelTests.java
index 5afb5df..487ee5c 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc4001/TC0004001ToolExtensionWithCustomRuntimeCreatedMetamodelTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc000/tc4001/TC0004001ToolExtensionWithCustomRuntimeCreatedMetamodelTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc000.tc4001;
 
 import static org.junit.Assert.assertFalse;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1000/TC1000SimpleContentModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1000/TC1000SimpleContentModelBuilder.java
index 325dcb6..9108ce2 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1000/TC1000SimpleContentModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1000/TC1000SimpleContentModelBuilder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -72,7 +72,7 @@
 	AttributeDefinitionEnumeration attributeDefinitionEnumerationMultiValue;
 
 	// SpecificationTypes
-	SpecificationType specificationType;
+	protected SpecificationType specificationType;
 
 	// SpecObjects
 	SpecObject specObject;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1000/TC1000SimpleContentTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1000/TC1000SimpleContentTests.java
index e14c2e7..87ec0dd 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1000/TC1000SimpleContentTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1000/TC1000SimpleContentTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1100/TC1100UnformattedSystemAttributesAndSpecHierarchyModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1100/TC1100UnformattedSystemAttributesAndSpecHierarchyModelBuilder.java
index a05a559..fc6cd8b 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1100/TC1100UnformattedSystemAttributesAndSpecHierarchyModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1100/TC1100UnformattedSystemAttributesAndSpecHierarchyModelBuilder.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1100;
 
 import java.math.BigInteger;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1100/TC1100UnformattedSystemAttributesAndSpecHierarchyTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1100/TC1100UnformattedSystemAttributesAndSpecHierarchyTests.java
index f45b4f2..248a853 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1100/TC1100UnformattedSystemAttributesAndSpecHierarchyTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1100/TC1100UnformattedSystemAttributesAndSpecHierarchyTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1100;
 
 import static org.junit.Assert.assertEquals;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1200/TC1200FormatedContentModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1200/TC1200FormatedContentModelBuilder.java
index 90fde72..80c881c 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1200/TC1200FormatedContentModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1200/TC1200FormatedContentModelBuilder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1200/TC1200FormatedContentTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1200/TC1200FormatedContentTests.java
index 831fa32..6a04964 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1200/TC1200FormatedContentTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1200/TC1200FormatedContentTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1250/TC1250ExternalFilesBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1250/TC1250ExternalFilesBuilder.java
index 8f55060..a807fe1 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1250/TC1250ExternalFilesBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1250/TC1250ExternalFilesBuilder.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1250;
 
 import java.math.BigInteger;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1250/TC1250ExternalFilesTest.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1250/TC1250ExternalFilesTest.java
index f82b905..000d9e8 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1250/TC1250ExternalFilesTest.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1250/TC1250ExternalFilesTest.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1250;
 
 import static org.junit.Assert.assertTrue;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1250/testdata/TC1250Testdata.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1250/testdata/TC1250Testdata.java
index a728e13..ff407e3 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1250/testdata/TC1250Testdata.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1250/testdata/TC1250Testdata.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 Formal Mind GmbH.
+ * Copyright (c) 2012, 2013 Formal Mind GmbH.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1300/TC1300SpecRelationModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1300/TC1300SpecRelationModelBuilder.java
index 26b9715..3b70e1d 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1300/TC1300SpecRelationModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1300/TC1300SpecRelationModelBuilder.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1300;
 
 import java.math.BigInteger;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1300/TC1300SpecRelationTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1300/TC1300SpecRelationTests.java
index 6ee2c58..6aec030 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1300/TC1300SpecRelationTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1300/TC1300SpecRelationTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1300;
 
 import static org.junit.Assert.assertEquals;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1400/TC1400InternalTableModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1400/TC1400InternalTableModelBuilder.java
index 90225a4..de9e8ba 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1400/TC1400InternalTableModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1400/TC1400InternalTableModelBuilder.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1400;
 
 import java.math.BigInteger;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1400/TC1400InternalTableTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1400/TC1400InternalTableTests.java
index 2b55768..33088a1 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1400/TC1400InternalTableTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1400/TC1400InternalTableTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1400;
 
 import static org.junit.Assert.assertEquals;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1500/TC1500AccessRestrictionTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1500/TC1500AccessRestrictionTests.java
index 1ad033b..4ab448d 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1500/TC1500AccessRestrictionTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1500/TC1500AccessRestrictionTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1500;
 
 import org.eclipse.rmf.tests.reqif10.serialization.util.AbstractTestCase;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1500/TC1500AccessRestrictionsModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1500/TC1500AccessRestrictionsModelBuilder.java
index 9704891..9667e3f 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1500/TC1500AccessRestrictionsModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1500/TC1500AccessRestrictionsModelBuilder.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1500;
 
 import org.eclipse.rmf.tests.reqif10.serialization.util.SimpleModelBuilder;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1600/TC1600ExternalContentModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1600/TC1600ExternalContentModelBuilder.java
index 8307a4e..2344b3b 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1600/TC1600ExternalContentModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1600/TC1600ExternalContentModelBuilder.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1600;
 
 import org.eclipse.rmf.tests.reqif10.serialization.util.SimpleModelBuilder;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1600/TC1600ExternalContentTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1600/TC1600ExternalContentTests.java
index fe473f4..e95b165 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1600/TC1600ExternalContentTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1600/TC1600ExternalContentTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1600;
 
 import org.eclipse.rmf.tests.reqif10.serialization.util.AbstractTestCase;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1700/TC1700SpecRelationMultifile1ModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1700/TC1700SpecRelationMultifile1ModelBuilder.java
index 6f6a008..317570b 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1700/TC1700SpecRelationMultifile1ModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1700/TC1700SpecRelationMultifile1ModelBuilder.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1700;
 
 import java.math.BigInteger;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1700/TC1700SpecRelationMultifile2ModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1700/TC1700SpecRelationMultifile2ModelBuilder.java
index 0e5b3e5..0ee5068 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1700/TC1700SpecRelationMultifile2ModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1700/TC1700SpecRelationMultifile2ModelBuilder.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1700;
 
 import org.eclipse.rmf.reqif10.RelationGroup;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1700/TC1700SpecRelationMultifileTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1700/TC1700SpecRelationMultifileTests.java
index 1feb789..54af8d7 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1700/TC1700SpecRelationMultifileTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc1700/TC1700SpecRelationMultifileTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1700;
 
 import static org.junit.Assert.assertEquals;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc3000/TC3000ToolExtensionsModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc3000/TC3000ToolExtensionsModelBuilder.java
index 973d83d..a251b00 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc3000/TC3000ToolExtensionsModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc3000/TC3000ToolExtensionsModelBuilder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc3000/TC3000ToolExtensionsTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc3000/TC3000ToolExtensionsTests.java
index a330c99..eefe6d3 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc3000/TC3000ToolExtensionsTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc3000/TC3000ToolExtensionsTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc4000/TC4000ModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc4000/TC4000ModelBuilder.java
index 3a7563e..6e070ac 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc4000/TC4000ModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc4000/TC4000ModelBuilder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc4000/TC4000Tests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc4000/TC4000Tests.java
index 6c968cf..e3191b1 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc4000/TC4000Tests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc001/tc4000/TC4000Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Formal Mind GmbH and University of Dusseldorf.
+ * Copyright (c) 2011, 2013 Formal Mind GmbH and University of Dusseldorf.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc002/TC9000SimpleContentPerformanceTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc002/TC9000SimpleContentPerformanceTests.java
index 1e88b42..9edc23b 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc002/TC9000SimpleContentPerformanceTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc002/TC9000SimpleContentPerformanceTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/ReqIFUtil.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/ReqIFUtil.java
index 59627ef..f6f2770 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/ReqIFUtil.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/ReqIFUtil.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc003.tc18xx;
 
 import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1800HISExchangeProcessModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1800HISExchangeProcessModelBuilder.java
index 6e572c8..7c36c90 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1800HISExchangeProcessModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1800HISExchangeProcessModelBuilder.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc003.tc18xx;
 
 import java.math.BigInteger;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1801HISExchangeProcessModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1801HISExchangeProcessModelBuilder.java
index eebbef9..d5fed76 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1801HISExchangeProcessModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1801HISExchangeProcessModelBuilder.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc003.tc18xx;
 
 import java.util.GregorianCalendar;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1802HISExchangeProcessModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1802HISExchangeProcessModelBuilder.java
index b744d64..c5ed2d7 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1802HISExchangeProcessModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1802HISExchangeProcessModelBuilder.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc003.tc18xx;
 
 import java.util.GregorianCalendar;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1803HISExchangeProcessModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1803HISExchangeProcessModelBuilder.java
index c839cb0..1975408 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1803HISExchangeProcessModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC1803HISExchangeProcessModelBuilder.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.uc003.tc18xx;
 
 import java.util.GregorianCalendar;
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC18xxHISExchangeProcessTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC18xxHISExchangeProcessTests.java
index 655c5cf..498a552 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC18xxHISExchangeProcessTests.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc003/tc18xx/TC18xxHISExchangeProcessTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc004/MultipleSupplierModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc004/MultipleSupplierModelBuilder.java
new file mode 100644
index 0000000..b79d8cc
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc004/MultipleSupplierModelBuilder.java
@@ -0,0 +1,289 @@
+package org.eclipse.rmf.tests.reqif10.serialization.uc004;
+
+import java.math.BigInteger;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration;
+import org.eclipse.rmf.reqif10.AttributeDefinitionString;
+import org.eclipse.rmf.reqif10.AttributeDefinitionXHTML;
+import org.eclipse.rmf.reqif10.AttributeValueEnumeration;
+import org.eclipse.rmf.reqif10.AttributeValueString;
+import org.eclipse.rmf.reqif10.AttributeValueXHTML;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionString;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML;
+import org.eclipse.rmf.reqif10.EmbeddedValue;
+import org.eclipse.rmf.reqif10.EnumValue;
+import org.eclipse.rmf.reqif10.ReqIF10Factory;
+import org.eclipse.rmf.reqif10.SpecHierarchy;
+import org.eclipse.rmf.reqif10.SpecObject;
+import org.eclipse.rmf.reqif10.SpecObjectType;
+import org.eclipse.rmf.reqif10.Specification;
+import org.eclipse.rmf.reqif10.SpecificationType;
+import org.eclipse.rmf.reqif10.XhtmlContent;
+import org.eclipse.rmf.tests.reqif10.serialization.util.SimpleModelBuilder;
+
+@SuppressWarnings("nls")
+public class MultipleSupplierModelBuilder extends SimpleModelBuilder {
+
+	// Convenience
+	private static final ReqIF10Factory factory = ReqIF10Factory.eINSTANCE;
+	private static GregorianCalendar DATE = new GregorianCalendar(2014, 1, 1);
+
+	private DatatypeDefinitionXHTML t_comment;
+	private DatatypeDefinitionEnumeration t_statusOEM;
+	private DatatypeDefinitionEnumeration t_statusSupplier;
+	private ReqifTool builderTool;
+	private DatatypeDefinitionString t_foreignId;
+	private DatatypeDefinitionXHTML t_text;
+
+	private AttributeDefinitionString ad_foreignId;
+	private AttributeDefinitionXHTML ad_text;
+	private Map<ReqifTool, AttributeDefinitionEnumeration> ad_oemStatus = new HashMap<ReqifTool, AttributeDefinitionEnumeration>();
+	private Map<ReqifTool, AttributeDefinitionXHTML> ad_oemComment = new HashMap<ReqifTool, AttributeDefinitionXHTML>();
+
+	private SpecObjectType specObjecttype;
+	private SpecificationType specType;;
+
+	public MultipleSupplierModelBuilder(ReqifTool tool) throws Exception {
+		super("multiple-supplier-test", "Multiple Supplier Test (" + tool + ")");
+		builderTool = tool;
+		getReqIF().getTheHeader().setCreationTime(DATE);
+	}
+
+	/**
+	 * Two datatypes: Enumeration and XHTML
+	 */
+	@Override
+	public void createDatatypes() throws Exception {
+		createDatatypeComment();
+		createDatatypeText();
+		createDatatypeForeignId();
+		createDatatypeStatusOEM();
+		createDatatypeStatusSupplier();
+	}
+
+	@Override
+	public void createSpecObjectTypes() throws Exception {
+		specObjecttype = factory.createSpecObjectType();
+		specObjecttype.setIdentifier("RequirementType");
+		specObjecttype.setLastChange(DATE);
+		specObjecttype.setLongName("RequirementType");
+
+		createForeignIdDefinition();
+		createTextDefinition();
+
+		getReqIF().getCoreContent().getSpecTypes().add(specObjecttype);
+		if (builderTool == ReqifTool.ALL_TOOLS) {
+			for (ReqifTool tool : ReqifTool.values()) {
+				if (tool != ReqifTool.ALL_TOOLS) {
+					createSpecObjectTypes(tool);
+				}
+			}
+			return;
+		}
+		createSpecObjectTypes(builderTool);
+	}
+
+	@Override
+	public void createSpecObjects() throws Exception {
+		for (ReqifTool tool : ReqifTool.values()) {
+			if (tool != ReqifTool.ALL_TOOLS) {
+				createSpecObject(tool);
+			}
+		}
+	}
+
+	private void createSpecObject(ReqifTool tool) throws Exception {
+		SpecObject obj = factory.createSpecObject();
+		obj.setIdentifier("SpecObject-" + tool);
+		obj.setLongName("SpecObject " + tool);
+		obj.setLastChange(DATE);
+		obj.setType(specObjecttype);
+		getReqIF().getCoreContent().getSpecObjects().add(obj);
+
+		AttributeValueString foreignId = factory.createAttributeValueString();
+		foreignId.setDefinition(ad_foreignId);
+		foreignId.setTheValue(tool.getForeignId());
+		obj.getValues().add(foreignId);
+
+		AttributeValueXHTML text = factory.createAttributeValueXHTML();
+		text.setDefinition(ad_text);
+		XhtmlContent content = SimpleModelBuilder.createXhtmlValue(tool + " plays the supplier for this requirement.");
+		text.setTheValue(content);
+		obj.getValues().add(text);
+
+		if (builderTool != ReqifTool.ALL_TOOLS) {
+			addSupplierAttributes(obj, tool, builderTool);
+		} else {
+			for (ReqifTool columnTool : ReqifTool.values()) {
+				if (columnTool != ReqifTool.ALL_TOOLS) {
+					addSupplierAttributes(obj, tool, columnTool);
+				}
+			}
+		}
+	}
+
+	private void addSupplierAttributes(SpecObject obj, ReqifTool rowTool, ReqifTool columnTool) {
+		XhtmlContent content;
+		AttributeValueXHTML comment = factory.createAttributeValueXHTML();
+		comment.setDefinition(ad_oemComment.get(columnTool));
+		obj.getValues().add(comment);
+
+		AttributeValueEnumeration oemStatus = factory.createAttributeValueEnumeration();
+		oemStatus.setDefinition(ad_oemStatus.get(columnTool));
+		obj.getValues().add(oemStatus);
+
+		if (rowTool == columnTool) {
+			oemStatus.getValues().add(t_statusOEM.getSpecifiedValues().get(1));
+			content = SimpleModelBuilder.createXhtmlValue("Set the Supplier Status to 'Not agreed' and the Supplier Comment to 'Not agreed'");
+		} else {
+			oemStatus.getValues().add(t_statusOEM.getSpecifiedValues().get(0));
+			content = SimpleModelBuilder.createXhtmlValue("Ignore this requirement.");
+		}
+		comment.setTheValue(content);
+	}
+
+	@Override
+	public void createSpecifications() throws Exception {
+		Specification spec = factory.createSpecification();
+		spec.setIdentifier("specification");
+		spec.setLongName("specification");
+		spec.setLastChange(DATE);
+		spec.setType(specType);
+		getReqIF().getCoreContent().getSpecifications().add(spec);
+
+		for (SpecObject object : getReqIF().getCoreContent().getSpecObjects()) {
+			SpecHierarchy sh = factory.createSpecHierarchy();
+			sh.setObject(object);
+			sh.setIdentifier("sh-" + object.getIdentifier());
+			sh.setLongName("sh-" + object.getIdentifier());
+			sh.setLastChange(DATE);
+			spec.getChildren().add(sh);
+		}
+	}
+
+	private void createDatatypeComment() throws Exception {
+		t_comment = factory.createDatatypeDefinitionXHTML();
+		t_comment.setLongName("T_Comment");
+		t_comment.setIdentifier("T_Comment");
+		t_comment.setLastChange(DATE);
+		getReqIF().getCoreContent().getDatatypes().add(t_comment);
+	}
+
+	private void createDatatypeText() throws Exception {
+		t_text = factory.createDatatypeDefinitionXHTML();
+		t_text.setLongName("T_Text");
+		t_text.setIdentifier("T_Text");
+		t_text.setLastChange(DATE);
+		getReqIF().getCoreContent().getDatatypes().add(t_text);
+	}
+
+	private void createDatatypeForeignId() throws Exception {
+		t_foreignId = factory.createDatatypeDefinitionString();
+		t_foreignId.setLongName("T_ForeignId");
+		t_foreignId.setIdentifier("T_ForeignId");
+		t_foreignId.setLastChange(DATE);
+		t_foreignId.setMaxLength(BigInteger.valueOf(255));
+		getReqIF().getCoreContent().getDatatypes().add(t_foreignId);
+	}
+
+	private void createDatatypeStatusOEM() throws Exception {
+		t_statusOEM = factory.createDatatypeDefinitionEnumeration();
+		t_statusOEM.setLongName("T_Status_OEM");
+		t_statusOEM.setIdentifier("T_Status_OEM");
+		t_statusOEM.setLastChange(DATE);
+		addEnum(t_statusOEM, 10, "Not to evaluate");
+		addEnum(t_statusOEM, 11, "To evaluate");
+		addEnum(t_statusOEM, 12, "Accepted");
+		addEnum(t_statusOEM, 13, "Not accepted");
+		getReqIF().getCoreContent().getDatatypes().add(t_statusOEM);
+	}
+
+	private void createDatatypeStatusSupplier() throws Exception {
+		t_statusSupplier = factory.createDatatypeDefinitionEnumeration();
+		t_statusSupplier.setLongName("T_Status_Supplier");
+		t_statusSupplier.setIdentifier("T_Status_Supplier");
+		t_statusSupplier.setLastChange(DATE);
+		addEnum(t_statusSupplier, 20, "To be clarified");
+		addEnum(t_statusSupplier, 21, "Agreed");
+		addEnum(t_statusSupplier, 22, "Not agreed");
+		addEnum(t_statusSupplier, 23, "Partly agreed");
+		getReqIF().getCoreContent().getDatatypes().add(t_statusSupplier);
+	}
+
+	private void addEnum(DatatypeDefinitionEnumeration enumeration, long key, String value) {
+		EnumValue enumValue = factory.createEnumValue();
+		enumValue.setIdentifier("id-" + key);
+		enumValue.setLongName(value);
+		enumValue.setLastChange(DATE);
+		EmbeddedValue embeddedValue = factory.createEmbeddedValue();
+		embeddedValue.setKey(BigInteger.valueOf(key));
+		embeddedValue.setOtherContent("otherContent-" + key);
+		enumValue.setProperties(embeddedValue);
+		enumeration.getSpecifiedValues().add(enumValue);
+	}
+
+	private void createTextDefinition() {
+		ad_text = factory.createAttributeDefinitionXHTML();
+		ad_text.setLongName("ReqIF.Text");
+		ad_text.setIdentifier("ReqIF.Text");
+		ad_text.setLastChange(DATE);
+		ad_text.setType(t_text);
+		specObjecttype.getSpecAttributes().add(ad_text);
+	}
+
+	private void createForeignIdDefinition() {
+		ad_foreignId = factory.createAttributeDefinitionString();
+		ad_foreignId.setLongName("ReqIF.ForeignID");
+		ad_foreignId.setIdentifier("ReqIF.ForeignID");
+		ad_foreignId.setLastChange(DATE);
+		ad_foreignId.setType(t_foreignId);
+		specObjecttype.getSpecAttributes().add(ad_foreignId);
+	}
+
+	private void createSpecObjectTypes(ReqifTool tool) throws Exception {
+		AttributeDefinitionEnumeration oem_status = factory.createAttributeDefinitionEnumeration();
+		oem_status.setLastChange(DATE);
+		oem_status.setIdentifier("oem-status-" + tool);
+		oem_status.setLongName("OEM Status " + tool);
+		oem_status.setType(t_statusOEM);
+		oem_status.setMultiValued(false);
+		specObjecttype.getSpecAttributes().add(oem_status);
+		ad_oemStatus.put(tool, oem_status);
+
+		AttributeDefinitionXHTML oem_comment = factory.createAttributeDefinitionXHTML();
+		oem_comment.setLastChange(DATE);
+		oem_comment.setIdentifier("oem-comment-" + tool);
+		oem_comment.setLongName("OEM Comment " + tool);
+		oem_comment.setType(t_comment);
+		specObjecttype.getSpecAttributes().add(oem_comment);
+		ad_oemComment.put(tool, oem_comment);
+
+		AttributeDefinitionEnumeration supplier_status = factory.createAttributeDefinitionEnumeration();
+		supplier_status.setLastChange(DATE);
+		supplier_status.setIdentifier("supplier-status-" + tool);
+		supplier_status.setLongName("Supplier Status " + tool);
+		supplier_status.setType(t_statusSupplier);
+		supplier_status.setMultiValued(false);
+		specObjecttype.getSpecAttributes().add(supplier_status);
+
+		AttributeDefinitionXHTML supplier_comment = factory.createAttributeDefinitionXHTML();
+		supplier_comment.setLastChange(DATE);
+		supplier_comment.setIdentifier("supplier-comment-" + tool);
+		supplier_comment.setLongName("Supplier Comment " + tool);
+		supplier_comment.setType(t_comment);
+		specObjecttype.getSpecAttributes().add(supplier_comment);
+	}
+
+	@Override
+	public void createSpecificationTypes() throws Exception {
+		specType = factory.createSpecificationType();
+		specType.setIdentifier("specType");
+		specType.setLongName("specType");
+		specType.setLastChange(DATE);
+		getReqIF().getCoreContent().getSpecTypes().add(specType);
+	}
+}
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc004/MultipleSupplierTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc004/MultipleSupplierTests.java
new file mode 100644
index 0000000..2c7678f
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc004/MultipleSupplierTests.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2014 Formal Mind GmbH.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Michael Jastram - initial API and implementation
+ * 
+ */
+package org.eclipse.rmf.tests.reqif10.serialization.uc004;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.eclipse.rmf.reqif10.ReqIF;
+import org.eclipse.rmf.tests.reqif10.serialization.util.AbstractTestCase;
+import org.eclipse.rmf.tests.reqif10.serialization.util.CommonSystemAttributes;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class MultipleSupplierTests extends AbstractTestCase implements CommonSystemAttributes {
+
+	@BeforeClass
+	public static void setupOnce() throws Exception {
+		AbstractTestCase.setupOnce();
+
+		Map<ReqifTool, ReqIF> reqifs = new TreeMap<ReqifTool, ReqIF>();
+		for (ReqifTool tool : ReqifTool.values()) {
+			String filename = getWorkingFileName("Supplier_Import_" //$NON-NLS-1$ 
+					+ tool + ".reqif"); //$NON-NLS-1$
+			System.out.println(filename);
+			ReqIF reqif = new MultipleSupplierModelBuilder(tool).getReqIF();
+			reqifs.put(tool, reqif);
+			saveReqIFFile(reqif, filename);
+		}
+	}
+
+	@Test
+	public void validate() throws Exception {
+
+	}
+}
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc004/README.txt b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc004/README.txt
new file mode 100644
index 0000000..96c9714
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc004/README.txt
@@ -0,0 +1,17 @@
+ReqIF-Testdata for ProSTEP Implementor Forum
+Multiple Supplier Scenario
+
+See Teamspace:
+Root folder / 04 Work Packages / 04 Testing / 04 - Multiple Supplier Scenario
+
+Tool names to be covered:
+- PTC
+- Requisis
+- IBM_DOORS
+- IBM_DOORS_NEXT
+- ReqifSrv
+- Atego
+- ReqEdit
+- ProR
+
+- 4_all
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc004/ReqifTool.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc004/ReqifTool.java
new file mode 100644
index 0000000..5823f73
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc004/ReqifTool.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2014 Formal Mind GmbH.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Michael Jastram - initial API and implementation
+ * 
+ */
+package org.eclipse.rmf.tests.reqif10.serialization.uc004;
+
+/**
+ * We have an enum for each tool for which a test file shall be generated.
+ */
+public enum ReqifTool {
+	ALL_TOOLS(0), IBM_DOORS(1), IBM_DOORS_NEXT(2), PTCINTEGRITY(3), REXDOORS(4), REQIFSERV(5), ATEGO(6), REQEDIT(7), PROR(8);
+
+	private final String foreignId;
+
+	ReqifTool(int foreignId) {
+		this.foreignId = foreignId + ""; //$NON-NLS-1$
+	}
+
+	public String getForeignId() {
+		return foreignId;
+	}
+}
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc005/RoundtripFilteringModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc005/RoundtripFilteringModelBuilder.java
new file mode 100644
index 0000000..39ad5a5
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc005/RoundtripFilteringModelBuilder.java
@@ -0,0 +1,313 @@
+package org.eclipse.rmf.tests.reqif10.serialization.uc005;
+
+import java.math.BigInteger;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.rmf.reqif10.AttributeDefinitionEnumeration;
+import org.eclipse.rmf.reqif10.AttributeDefinitionString;
+import org.eclipse.rmf.reqif10.AttributeDefinitionXHTML;
+import org.eclipse.rmf.reqif10.AttributeValueEnumeration;
+import org.eclipse.rmf.reqif10.AttributeValueString;
+import org.eclipse.rmf.reqif10.AttributeValueXHTML;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionString;
+import org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML;
+import org.eclipse.rmf.reqif10.EmbeddedValue;
+import org.eclipse.rmf.reqif10.EnumValue;
+import org.eclipse.rmf.reqif10.ReqIF10Factory;
+import org.eclipse.rmf.reqif10.SpecHierarchy;
+import org.eclipse.rmf.reqif10.SpecObject;
+import org.eclipse.rmf.reqif10.SpecObjectType;
+import org.eclipse.rmf.reqif10.Specification;
+import org.eclipse.rmf.reqif10.SpecificationType;
+import org.eclipse.rmf.reqif10.XhtmlContent;
+import org.eclipse.rmf.tests.reqif10.serialization.uc004.ReqifTool;
+import org.eclipse.rmf.tests.reqif10.serialization.util.SimpleModelBuilder;
+
+@SuppressWarnings("nls")
+public class RoundtripFilteringModelBuilder extends SimpleModelBuilder {
+
+	// Convenience
+	private static final ReqIF10Factory factory = ReqIF10Factory.eINSTANCE;
+	private static GregorianCalendar DATE = new GregorianCalendar(2014, 1, 1);
+
+	private DatatypeDefinitionXHTML t_comment;
+	private DatatypeDefinitionEnumeration t_statusOEM;
+	private DatatypeDefinitionEnumeration t_statusSupplier;
+	private DatatypeDefinitionString t_foreignId;
+	private DatatypeDefinitionXHTML t_text;
+	private DatatypeDefinitionEnumeration t_variant;
+
+	private AttributeDefinitionString ad_foreignId;
+	private AttributeDefinitionXHTML ad_text;
+	private Map<ReqifTool, AttributeDefinitionEnumeration> ad_oemStatus = new HashMap<ReqifTool, AttributeDefinitionEnumeration>();
+	private Map<ReqifTool, AttributeDefinitionXHTML> ad_oemComment = new HashMap<ReqifTool, AttributeDefinitionXHTML>();
+
+	private SpecObjectType specObjecttype;
+	private SpecificationType specType;
+	private AttributeDefinitionEnumeration ad_variant;
+	private AttributeDefinitionXHTML ad_internal;;
+
+	public RoundtripFilteringModelBuilder() throws Exception {
+		super("multiple-supplier-test", "Roundtrip Filtering Test");
+		getReqIF().getTheHeader().setCreationTime(DATE);
+	}
+
+	/**
+	 * Two datatypes: Enumeration and XHTML
+	 */
+	@Override
+	public void createDatatypes() throws Exception {
+		createDatatypeComment();
+		createDatatypeText();
+		createDatatypeForeignId();
+		createDatatypeStatusOEM();
+		createDatatypeStatusSupplier();
+		createDatatypeVariant();
+	}
+
+	@Override
+	public void createSpecObjectTypes() throws Exception {
+		specObjecttype = factory.createSpecObjectType();
+		specObjecttype.setIdentifier("RequirementType");
+		specObjecttype.setLastChange(DATE);
+		specObjecttype.setLongName("RequirementType");
+
+		createForeignIdDefinition();
+		createTextDefinition();
+		createVariantDefinition();
+		createInternalDefinition();
+
+		getReqIF().getCoreContent().getSpecTypes().add(specObjecttype);
+		for (ReqifTool tool : ReqifTool.values()) {
+			if (tool != ReqifTool.ALL_TOOLS) {
+				createSpecObjectTypes(tool);
+			}
+		}
+		return;
+	}
+
+	@Override
+	public void createSpecObjects() throws Exception {
+		createSpecObject("REQ-1", "Steering Wheel Spec", 0b111, null);
+		createSpecObject("REQ-2", "The diameter of the steering wheel must be 320mm", 0b111,
+				"320mm is optimal according to our newest top secret study");
+		createSpecObject("REQ-3", "The steering wheel will have an airbag. Carry-Over-Part Nr: 0012.444.WHL.AB", 0b111, null);
+		createSpecObject("REQ-4", "The rim cover has to be constructed out of plastics", 0b001, "Supplier xy fails to reach the quality we need");
+		createSpecObject("REQ-5", "The rim cover must be a leather wrapping", 0b010, null);
+		createSpecObject("REQ-6", "The rim cover must be a leather wrapping and wooden veener on top and bottom", 0b100, null);
+		createSpecObject("REQ-7", "Audio and display functions must be controllable via buttons on the steering wheel", 0b110, null);
+	}
+
+	private void createSpecObject(String id, String desc, int variant, String internalKnowHow) throws Exception {
+		SpecObject obj = factory.createSpecObject();
+		obj.setIdentifier(id);
+		obj.setLongName("SpecObject " + id);
+		obj.setLastChange(DATE);
+		obj.setType(specObjecttype);
+		getReqIF().getCoreContent().getSpecObjects().add(obj);
+
+		AttributeValueString foreignId = factory.createAttributeValueString();
+		foreignId.setDefinition(ad_foreignId);
+		foreignId.setTheValue(id);
+		obj.getValues().add(foreignId);
+
+		AttributeValueXHTML text = factory.createAttributeValueXHTML();
+		text.setDefinition(ad_text);
+		XhtmlContent content = SimpleModelBuilder.createXhtmlValue(desc);
+		text.setTheValue(content);
+		obj.getValues().add(text);
+
+		if (internalKnowHow != null) {
+			AttributeValueXHTML internal = factory.createAttributeValueXHTML();
+			internal.setDefinition(ad_internal);
+			content = SimpleModelBuilder.createXhtmlValue(internalKnowHow);
+			internal.setTheValue(content);
+			obj.getValues().add(internal);
+		}
+
+		AttributeValueEnumeration v = factory.createAttributeValueEnumeration();
+		v.setDefinition(ad_variant);
+		obj.getValues().add(v);
+		for (int i = 0; i < 3; i++) {
+			int bit = variant >> i & 0b1;
+			if (bit == 1) {
+				v.getValues().add(t_variant.getSpecifiedValues().get(i));
+			}
+		}
+
+	}
+
+	@Override
+	public void createSpecifications() throws Exception {
+		Specification spec = factory.createSpecification();
+		spec.setIdentifier("specification");
+		spec.setLongName("specification");
+		spec.setLastChange(DATE);
+		spec.setType(specType);
+		getReqIF().getCoreContent().getSpecifications().add(spec);
+
+		for (SpecObject object : getReqIF().getCoreContent().getSpecObjects()) {
+			SpecHierarchy sh = factory.createSpecHierarchy();
+			sh.setObject(object);
+			sh.setIdentifier("sh-" + object.getIdentifier());
+			sh.setLongName("sh-" + object.getIdentifier());
+			sh.setLastChange(DATE);
+			spec.getChildren().add(sh);
+		}
+	}
+
+	private void createDatatypeComment() throws Exception {
+		t_comment = factory.createDatatypeDefinitionXHTML();
+		t_comment.setLongName("T_Comment");
+		t_comment.setIdentifier("T_Comment");
+		t_comment.setLastChange(DATE);
+		getReqIF().getCoreContent().getDatatypes().add(t_comment);
+	}
+
+	private void createDatatypeText() throws Exception {
+		t_text = factory.createDatatypeDefinitionXHTML();
+		t_text.setLongName("T_Text");
+		t_text.setIdentifier("T_Text");
+		t_text.setLastChange(DATE);
+		getReqIF().getCoreContent().getDatatypes().add(t_text);
+	}
+
+	private void createDatatypeForeignId() throws Exception {
+		t_foreignId = factory.createDatatypeDefinitionString();
+		t_foreignId.setLongName("T_ForeignId");
+		t_foreignId.setIdentifier("T_ForeignId");
+		t_foreignId.setLastChange(DATE);
+		t_foreignId.setMaxLength(BigInteger.valueOf(255));
+		getReqIF().getCoreContent().getDatatypes().add(t_foreignId);
+	}
+
+	private void createDatatypeStatusOEM() throws Exception {
+		t_statusOEM = factory.createDatatypeDefinitionEnumeration();
+		t_statusOEM.setLongName("T_Status_OEM");
+		t_statusOEM.setIdentifier("T_Status_OEM");
+		t_statusOEM.setLastChange(DATE);
+		addEnum(t_statusOEM, 10, "Not to evaluate");
+		addEnum(t_statusOEM, 11, "To evaluate");
+		addEnum(t_statusOEM, 12, "Accepted");
+		addEnum(t_statusOEM, 13, "Not accepted");
+		getReqIF().getCoreContent().getDatatypes().add(t_statusOEM);
+	}
+
+	private void createDatatypeStatusSupplier() throws Exception {
+		t_statusSupplier = factory.createDatatypeDefinitionEnumeration();
+		t_statusSupplier.setLongName("T_Status_Supplier");
+		t_statusSupplier.setIdentifier("T_Status_Supplier");
+		t_statusSupplier.setLastChange(DATE);
+		addEnum(t_statusSupplier, 20, "To be clarified");
+		addEnum(t_statusSupplier, 21, "Agreed");
+		addEnum(t_statusSupplier, 22, "Not agreed");
+		addEnum(t_statusSupplier, 23, "Partly agreed");
+		getReqIF().getCoreContent().getDatatypes().add(t_statusSupplier);
+	}
+
+	private void createDatatypeVariant() throws Exception {
+		t_variant = factory.createDatatypeDefinitionEnumeration();
+		t_variant.setLongName("T_Variant");
+		t_variant.setIdentifier("T_Variant");
+		t_variant.setLastChange(DATE);
+		addEnum(t_variant, 30, "LO");
+		addEnum(t_variant, 31, "MID");
+		addEnum(t_variant, 32, "HI");
+		getReqIF().getCoreContent().getDatatypes().add(t_variant);
+	}
+
+	private void addEnum(DatatypeDefinitionEnumeration enumeration, long key, String value) {
+		EnumValue enumValue = factory.createEnumValue();
+		enumValue.setIdentifier("id-" + key);
+		enumValue.setLongName(value);
+		enumValue.setLastChange(DATE);
+		EmbeddedValue embeddedValue = factory.createEmbeddedValue();
+		embeddedValue.setKey(BigInteger.valueOf(key));
+		embeddedValue.setOtherContent("otherContent-" + key);
+		enumValue.setProperties(embeddedValue);
+		enumeration.getSpecifiedValues().add(enumValue);
+	}
+
+	private void createTextDefinition() {
+		ad_text = factory.createAttributeDefinitionXHTML();
+		ad_text.setLongName("ReqIF.Text");
+		ad_text.setIdentifier("ReqIF.Text");
+		ad_text.setLastChange(DATE);
+		ad_text.setType(t_text);
+		specObjecttype.getSpecAttributes().add(ad_text);
+	}
+
+	private void createInternalDefinition() {
+		ad_internal = factory.createAttributeDefinitionXHTML();
+		ad_internal.setLongName("Internal Know-How");
+		ad_internal.setIdentifier("InternalKnowHow");
+		ad_internal.setLastChange(DATE);
+		ad_internal.setType(t_text);
+		specObjecttype.getSpecAttributes().add(ad_internal);
+	}
+
+	private void createVariantDefinition() {
+		ad_variant = factory.createAttributeDefinitionEnumeration();
+		ad_variant.setLongName("Variant");
+		ad_variant.setIdentifier("Variant");
+		ad_variant.setLastChange(DATE);
+		ad_variant.setType(t_variant);
+		ad_variant.setMultiValued(true);
+		specObjecttype.getSpecAttributes().add(ad_variant);
+	}
+
+	private void createForeignIdDefinition() {
+		ad_foreignId = factory.createAttributeDefinitionString();
+		ad_foreignId.setLongName("ReqIF.ForeignID");
+		ad_foreignId.setIdentifier("ReqIF.ForeignID");
+		ad_foreignId.setLastChange(DATE);
+		ad_foreignId.setType(t_foreignId);
+		specObjecttype.getSpecAttributes().add(ad_foreignId);
+	}
+
+	private void createSpecObjectTypes(ReqifTool tool) throws Exception {
+		AttributeDefinitionEnumeration oem_status = factory.createAttributeDefinitionEnumeration();
+		oem_status.setLastChange(DATE);
+		oem_status.setIdentifier("oem-status-" + tool);
+		oem_status.setLongName("OEM Status " + tool);
+		oem_status.setType(t_statusOEM);
+		oem_status.setMultiValued(false);
+		specObjecttype.getSpecAttributes().add(oem_status);
+		ad_oemStatus.put(tool, oem_status);
+
+		AttributeDefinitionXHTML oem_comment = factory.createAttributeDefinitionXHTML();
+		oem_comment.setLastChange(DATE);
+		oem_comment.setIdentifier("oem-comment-" + tool);
+		oem_comment.setLongName("OEM Comment " + tool);
+		oem_comment.setType(t_comment);
+		specObjecttype.getSpecAttributes().add(oem_comment);
+		ad_oemComment.put(tool, oem_comment);
+
+		AttributeDefinitionEnumeration supplier_status = factory.createAttributeDefinitionEnumeration();
+		supplier_status.setLastChange(DATE);
+		supplier_status.setIdentifier("supplier-status-" + tool);
+		supplier_status.setLongName("Supplier Status " + tool);
+		supplier_status.setType(t_statusSupplier);
+		supplier_status.setMultiValued(false);
+		specObjecttype.getSpecAttributes().add(supplier_status);
+
+		AttributeDefinitionXHTML supplier_comment = factory.createAttributeDefinitionXHTML();
+		supplier_comment.setLastChange(DATE);
+		supplier_comment.setIdentifier("supplier-comment-" + tool);
+		supplier_comment.setLongName("Supplier Comment " + tool);
+		supplier_comment.setType(t_comment);
+		specObjecttype.getSpecAttributes().add(supplier_comment);
+	}
+
+	@Override
+	public void createSpecificationTypes() throws Exception {
+		specType = factory.createSpecificationType();
+		specType.setIdentifier("specType");
+		specType.setLongName("specType");
+		specType.setLastChange(DATE);
+		getReqIF().getCoreContent().getSpecTypes().add(specType);
+	}
+}
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc005/RoundtripFilteringTests.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc005/RoundtripFilteringTests.java
new file mode 100644
index 0000000..5fd6851
--- /dev/null
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/uc005/RoundtripFilteringTests.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2014 Formal Mind GmbH.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Michael Jastram - initial API and implementation
+ * 
+ */
+package org.eclipse.rmf.tests.reqif10.serialization.uc005;
+
+import org.eclipse.rmf.reqif10.ReqIF;
+import org.eclipse.rmf.tests.reqif10.serialization.util.AbstractTestCase;
+import org.eclipse.rmf.tests.reqif10.serialization.util.CommonSystemAttributes;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class RoundtripFilteringTests extends AbstractTestCase implements CommonSystemAttributes {
+
+	@BeforeClass
+	public static void setupOnce() throws Exception {
+		AbstractTestCase.setupOnce();
+
+		String filename = getWorkingFileName("RountripFiltering.reqif"); //$NON-NLS-1$
+		System.out.println(filename);
+		ReqIF reqif = new RoundtripFilteringModelBuilder().getReqIF();
+		saveReqIFFile(reqif, filename);
+	}
+
+	@Test
+	public void validate() throws Exception {
+
+	}
+}
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/AbstractTestCase.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/AbstractTestCase.java
index f0dc77d..ffb60fc 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/AbstractTestCase.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/AbstractTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/CommonSystemAttributes.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/CommonSystemAttributes.java
index 3df0578..b3c4055 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/CommonSystemAttributes.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/CommonSystemAttributes.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.reqif10.serialization.util;
 
 public interface CommonSystemAttributes {
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/MinimalModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/MinimalModelBuilder.java
index abdc223..7683791 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/MinimalModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/MinimalModelBuilder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/ReqIFContentModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/ReqIFContentModelBuilder.java
index 841881e..bc4c1e2 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/ReqIFContentModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/ReqIFContentModelBuilder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/SimpleModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/SimpleModelBuilder.java
index 3453a2c..1a3fe83 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/SimpleModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/SimpleModelBuilder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/TC9000ModelBuilder.java b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/TC9000ModelBuilder.java
index 8b11800..293acaa 100644
--- a/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/TC9000ModelBuilder.java
+++ b/org.eclipse.rmf.tests.reqif10.serialization/src/org/eclipse/rmf/tests/reqif10/serialization/util/TC9000ModelBuilder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012 itemis AG.
+ * Copyright (c) 2012, 2013 itemis AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,7 +13,10 @@
 
 import java.math.BigInteger;
 
+import org.eclipse.rmf.reqif10.ReqIF10Factory;
+import org.eclipse.rmf.reqif10.SpecHierarchy;
 import org.eclipse.rmf.reqif10.SpecObject;
+import org.eclipse.rmf.reqif10.Specification;
 import org.eclipse.rmf.tests.reqif10.serialization.uc001.tc1000.TC1000SimpleContentModelBuilder;
 
 @SuppressWarnings("nls")
@@ -31,7 +34,7 @@
 	public void createSpecObjects() throws Exception {
 		for (int i = 0; i < numberOfSpecObjects; i++) {
 
-			SpecObject specObject = createTC1000SpecObject("ID_TC1000_SpecObject" + i, toDate(LAST_CHANGE_STRING), true, false,
+			SpecObject specObject = createTC1000SpecObject("ID_TC9000_SpecObject" + i, toDate(LAST_CHANGE_STRING), true, false,
 					new BigInteger("5000"), "Plain", 1234.5, toDate(LAST_CHANGE_STRING), enumValueYellow);
 
 			getReqIF().getCoreContent().getSpecObjects().add(specObject);
@@ -39,6 +42,25 @@
 	}
 
 	@Override
+	public void createSpecifications() throws Exception {
+		Specification specification = ReqIF10Factory.eINSTANCE.createSpecification();
+		specification.setIdentifier("ID_TC1000_Specification");
+		specification.setType(specificationType);
+		specification.setLastChange(toDate(LAST_CHANGE_STRING));
+
+		for (SpecObject specObject : getReqIF().getCoreContent().getSpecObjects()) {
+			SpecHierarchy specHierarchy = ReqIF10Factory.eINSTANCE.createSpecHierarchy();
+			specHierarchy.setIdentifier(specObject.getIdentifier() + "_SpecHierarchy");
+			specHierarchy.setLastChange(toDate(LAST_CHANGE_STRING));
+			specHierarchy.setObject(specObject);
+			specification.getChildren().add(specHierarchy);
+		}
+
+		getReqIF().getCoreContent().getSpecifications().add(specification);
+
+	}
+
+	@Override
 	public void createSpecRelations() throws Exception {
 		// TODO Auto-generated method stub
 		super.createSpecRelations();
diff --git a/org.eclipse.rmf.tests.serialization/META-INF/MANIFEST.MF b/org.eclipse.rmf.tests.serialization/META-INF/MANIFEST.MF
index 720f80f..0fcd54c 100644
--- a/org.eclipse.rmf.tests.serialization/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.tests.serialization/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rmf.tests.serialization
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-ClassPath: .
 Require-Bundle: org.junit,
  org.eclipse.emf.ecore;bundle-version="2.7.0",
diff --git a/org.eclipse.rmf.tests.serialization/build.properties b/org.eclipse.rmf.tests.serialization/build.properties
index cac6496..d53ddd2 100644
--- a/org.eclipse.rmf.tests.serialization/build.properties
+++ b/org.eclipse.rmf.tests.serialization/build.properties
@@ -1,9 +1,22 @@
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 #
 
 bin.includes = .,\
                resources/model/,\
                META-INF/,\
-               plugin.properties
+               plugin.properties,\
+               notice.html,\
+               epl-v10.html,\
+               about.html
 jars.compile.order = .
 source.. = src, src-gen/
 output.. = bin/
diff --git a/org.eclipse.rmf.tests.serialization/epl-v10.html b/org.eclipse.rmf.tests.serialization/epl-v10.html
index 84ec251..3998fce 100644
--- a/org.eclipse.rmf.tests.serialization/epl-v10.html
+++ b/org.eclipse.rmf.tests.serialization/epl-v10.html
@@ -27,7 +27,7 @@
 
 <body lang="EN-US">
 
-<p align=center><b>Eclipse Public License - v 1.0</b></p>
+<h2>Eclipse Public License - v 1.0</h2>
 
 <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
 PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
@@ -258,4 +258,4 @@
 
 </body>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.rmf.tests.serialization/notice.html b/org.eclipse.rmf.tests.serialization/notice.html
index f19c483..c3d34c3 100644
--- a/org.eclipse.rmf.tests.serialization/notice.html
+++ b/org.eclipse.rmf.tests.serialization/notice.html
@@ -8,7 +8,7 @@
 
 <body lang="EN-US">
 <h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
+<p>April 9, 2014</p>
 
 <h3>Usage Of Content</h3>
 
@@ -62,7 +62,6 @@
        <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
        <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
        <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
        <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
 </ul>
 
diff --git a/org.eclipse.rmf.tests.serialization/plugin.properties b/org.eclipse.rmf.tests.serialization/plugin.properties
index 7fe51c1..cb910f1 100644
--- a/org.eclipse.rmf.tests.serialization/plugin.properties
+++ b/org.eclipse.rmf.tests.serialization/plugin.properties
@@ -1,11 +1,13 @@
-# Copyright (c) 2013 itemis AG.
+###############################################################################
+# Copyright (c) 2014 itemis AG and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # Contributors:
-#     Mark Broerkens - initial API and implementation
+#     Mark Broerkens (itemis AG) - initial API and implementation
+###############################################################################
 
 pluginName = RMF Serialization Tests (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/org.eclipse.rmf.tests.serialization/pom.xml b/org.eclipse.rmf.tests.serialization/pom.xml
index 59435bd..2b6b54e 100644
--- a/org.eclipse.rmf.tests.serialization/pom.xml
+++ b/org.eclipse.rmf.tests.serialization/pom.xml
@@ -19,12 +19,11 @@
 	<parent>
 		<groupId>org.eclipse.rmf</groupId>
 		<artifactId>org.eclipse.rmf.releng</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.10.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.rmf.plugins</groupId>
 	<artifactId>org.eclipse.rmf.tests.serialization</artifactId>
-	<version>0.9.0-SNAPSHOT</version>
 	<properties>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   	</properties>
@@ -60,7 +59,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<includes>
 						<include>**/*Tests.class</include>
diff --git a/org.eclipse.rmf.tests.serialization/resources/model/extnodes.genmodel b/org.eclipse.rmf.tests.serialization/resources/model/extnodes.genmodel
index c6ae749..75e9ca7 100644
--- a/org.eclipse.rmf.tests.serialization/resources/model/extnodes.genmodel
+++ b/org.eclipse.rmf.tests.serialization/resources/model/extnodes.genmodel
@@ -1,6 +1,6 @@
 <?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" copyrightText="Copyright (c) 2013 itemis AG.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA;   itemis AG - initial API and implementation&#xA;"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 itemis AG and others.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA;   itemis AG - initial API and implementation&#xA;"
     modelDirectory="/org.eclipse.rmf.tests.serialization/src-gen" editDirectory=""
     editorDirectory="" modelPluginID="org.eclipse.rmf.tests.serialization" modelName="Extnodes"
     editPluginClass="" editorPluginClass="" updateClasspath="false" testsDirectory=""
diff --git a/org.eclipse.rmf.tests.serialization/resources/model/myreqif.genmodel b/org.eclipse.rmf.tests.serialization/resources/model/myreqif.genmodel
index fdf6170..985aebe 100644
--- a/org.eclipse.rmf.tests.serialization/resources/model/myreqif.genmodel
+++ b/org.eclipse.rmf.tests.serialization/resources/model/myreqif.genmodel
@@ -1,6 +1,6 @@
 <?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" copyrightText="Copyright (c) 2013 itemis AG.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA;   itemis AG - initial API and implementation&#xA;"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 itemis AG and others.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA;   itemis AG - initial API and implementation&#xA;"
     modelDirectory="/org.eclipse.rmf.tests.serialization/src-gen" editDirectory=""
     editorDirectory="" modelPluginID="org.eclipse.rmf.tests.serialization" modelName="Myreqif"
     modelPluginClass="" editPluginClass="" editorPluginClass="" updateClasspath="false"
diff --git a/org.eclipse.rmf.tests.serialization/resources/model/nodes.genmodel b/org.eclipse.rmf.tests.serialization/resources/model/nodes.genmodel
index 98bafc7..dc28ecd 100644
--- a/org.eclipse.rmf.tests.serialization/resources/model/nodes.genmodel
+++ b/org.eclipse.rmf.tests.serialization/resources/model/nodes.genmodel
@@ -1,6 +1,6 @@
 <?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" copyrightText="Copyright (c) 2013 itemis AG.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA;   itemis AG - initial API and implementation&#xA;"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 itemis AG and others.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA;   itemis AG - initial API and implementation&#xA;"
     modelDirectory="/org.eclipse.rmf.tests.serialization/src-gen" editDirectory=""
     editorDirectory="" modelPluginID="" modelName="Nodes" editPluginClass="" editorPluginClass=""
     updateClasspath="false" testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEID.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEID.java
index 7008d5f..fc4cdd4 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEID.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEID.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType.java
index a45e0be..ac8c576 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType1.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType1.java
index af98825..396b215 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType1.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType1.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType10.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType10.java
index 94e35c4..271c886 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType10.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType10.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType11.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType11.java
index 63e4afa..086ab20 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType11.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType11.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType12.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType12.java
index 86e0bfd..56a60cd 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType12.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType12.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType13.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType13.java
index a9745a3..639f03c 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType13.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType13.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType14.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType14.java
index 6410d13..32c5327 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType14.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType14.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType15.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType15.java
index f27dad5..49adb6d 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType15.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType15.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType16.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType16.java
index f6d58ed..8e5d9c1 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType16.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType16.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType17.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType17.java
index 690cd4b..c44453a 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType17.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType17.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType18.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType18.java
index ef25a48..0e5ef9d 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType18.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType18.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType19.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType19.java
index 15c4c26..2e7cb30 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType19.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType19.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType2.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType2.java
index eb6e0c7..4bddb1f 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType2.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType2.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType20.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType20.java
index faa4df8..e626119 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType20.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType20.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType21.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType21.java
index 65a24d0..add610d 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType21.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType21.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType22.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType22.java
index 6b86c0b..bbadc3a 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType22.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType22.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType23.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType23.java
index e63bfc3..2a8306d 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType23.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType23.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType3.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType3.java
index ccc46ca..6a1e5cb 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType3.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType3.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType4.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType4.java
index 1fb0ab9..9c97d4d 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType4.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType4.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType5.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType5.java
index c2bd51f..0dc289a 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType5.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType5.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType6.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType6.java
index a706e94..85bbbaf 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType6.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType6.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType7.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType7.java
index cde9838..29099bc 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType7.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType7.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType8.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType8.java
index 854ee77..6f8d7a9 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType8.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType8.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType9.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType9.java
index d99f12f..48ffb50 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType9.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ALTERNATIVEIDType9.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONBOOLEAN.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONBOOLEAN.java
index fae1f60..3fe46df 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONBOOLEAN.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONBOOLEAN.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONDATE.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONDATE.java
index 1245bc4..0ceada2 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONDATE.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONDATE.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONENUMERATION.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONENUMERATION.java
index 18cf965..5c8c16f 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONENUMERATION.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONENUMERATION.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONINTEGER.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONINTEGER.java
index 3798923..e4fa798 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONINTEGER.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONINTEGER.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONREAL.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONREAL.java
index 0913231..ce73317 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONREAL.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONREAL.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONSTRING.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONSTRING.java
index 55d0ff4..17bd733 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONSTRING.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONSTRING.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONXHTML.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONXHTML.java
index 86033ea..61470fa 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONXHTML.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEDEFINITIONXHTML.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEBOOLEAN.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEBOOLEAN.java
index 92ee8b4..0bd8c3b 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEBOOLEAN.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEBOOLEAN.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEDATE.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEDATE.java
index 24646b5..a4d72f3 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEDATE.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEDATE.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEENUMERATION.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEENUMERATION.java
index 3cf0110..be5ed42 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEENUMERATION.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEENUMERATION.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEINTEGER.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEINTEGER.java
index 8bdc1f4..95454a6 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEINTEGER.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEINTEGER.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEREAL.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEREAL.java
index 1fd947c..3e5e875 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEREAL.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEREAL.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUESTRING.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUESTRING.java
index 2c9e6e2..0fb2689 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUESTRING.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUESTRING.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEXHTML.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEXHTML.java
index a88e4c4..05fb325 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEXHTML.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ATTRIBUTEVALUEXHTML.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/CHILDRENType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/CHILDRENType.java
index f90798b..d8fd060 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/CHILDRENType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/CHILDRENType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/CHILDRENType1.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/CHILDRENType1.java
index ba14970..5d223f6 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/CHILDRENType1.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/CHILDRENType1.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/CORECONTENTType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/CORECONTENTType.java
index 6117382..373e22b 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/CORECONTENTType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/CORECONTENTType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONBOOLEAN.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONBOOLEAN.java
index d933303..99ac4d8 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONBOOLEAN.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONBOOLEAN.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONDATE.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONDATE.java
index b70cd6a..f27e6c0 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONDATE.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONDATE.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONENUMERATION.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONENUMERATION.java
index 7c0c1a4..6d06a91 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONENUMERATION.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONENUMERATION.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONINTEGER.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONINTEGER.java
index c494da5..f2ea7d5 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONINTEGER.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONINTEGER.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONREAL.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONREAL.java
index c097d60..68c7f33 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONREAL.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONREAL.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONSTRING.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONSTRING.java
index 0802a00..aad18ba 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONSTRING.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONSTRING.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONXHTML.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONXHTML.java
index 9c84155..2c9f57c 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONXHTML.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPEDEFINITIONXHTML.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPESType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPESType.java
index a4cff44..95c25f6 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPESType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DATATYPESType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType.java
index 89ed45c..ec63ba9 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType1.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType1.java
index 0143b0d..579edbf 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType1.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType1.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType2.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType2.java
index 1043715..99d97d5 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType2.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType2.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType3.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType3.java
index b325ad8..2f0aa62 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType3.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType3.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType4.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType4.java
index 77d6058..1da5ea3 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType4.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType4.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType5.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType5.java
index 4db1092..ac4a7da 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType5.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType5.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType6.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType6.java
index 3340b3f..e1512ac 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType6.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFAULTVALUEType6.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType.java
index fdb8db0..4c48e5d 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType1.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType1.java
index bb5210b..2d468f9 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType1.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType1.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType2.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType2.java
index 7083037..2aae726 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType2.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType2.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType3.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType3.java
index 88562b1..3b5efd6 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType3.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType3.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType4.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType4.java
index 5be1f2e..e60c4fd 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType4.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType4.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType5.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType5.java
index 8df7f2b..084cd43 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType5.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType5.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType6.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType6.java
index 96758c0..d975676 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType6.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DEFINITIONType6.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DocumentRoot.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DocumentRoot.java
index 4f39313..7039ae6 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DocumentRoot.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/DocumentRoot.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/EDITABLEATTSType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/EDITABLEATTSType.java
index cb6f484..bfb9bea 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/EDITABLEATTSType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/EDITABLEATTSType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/EMBEDDEDVALUE.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/EMBEDDEDVALUE.java
index 566b404..de06e0d 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/EMBEDDEDVALUE.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/EMBEDDEDVALUE.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ENUMVALUE.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ENUMVALUE.java
index 3719cdd..64b1dfd 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ENUMVALUE.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/ENUMVALUE.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/MyreqifFactory.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/MyreqifFactory.java
index ca26dd7..c522a1a 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/MyreqifFactory.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/MyreqifFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/MyreqifPackage.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/MyreqifPackage.java
index 1ab988c..1198ae8 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/MyreqifPackage.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/MyreqifPackage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/OBJECTType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/OBJECTType.java
index 7a9e73e..36838c9 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/OBJECTType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/OBJECTType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/PROPERTIESType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/PROPERTIESType.java
index b77ebe3..5608576 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/PROPERTIESType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/PROPERTIESType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/RELATIONGROUP.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/RELATIONGROUP.java
index f6b36da..a5a6615 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/RELATIONGROUP.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/RELATIONGROUP.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/RELATIONGROUPTYPE.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/RELATIONGROUPTYPE.java
index 56bfcdb..94d7494 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/RELATIONGROUPTYPE.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/RELATIONGROUPTYPE.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/REQIF.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/REQIF.java
index 0f70a7e..71394e8 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/REQIF.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/REQIF.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/REQIFCONTENT.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/REQIFCONTENT.java
index 665cd13..187624e 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/REQIFCONTENT.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/REQIFCONTENT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/REQIFHEADER.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/REQIFHEADER.java
index 5a2781e..64e40a3 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/REQIFHEADER.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/REQIFHEADER.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/REQIFTOOLEXTENSION.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/REQIFTOOLEXTENSION.java
index d86d93f..e335717 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/REQIFTOOLEXTENSION.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/REQIFTOOLEXTENSION.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SOURCESPECIFICATIONType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SOURCESPECIFICATIONType.java
index 6886605..5cdbc1a 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SOURCESPECIFICATIONType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SOURCESPECIFICATIONType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SOURCEType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SOURCEType.java
index bd9c321..0291668 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SOURCEType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SOURCEType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECATTRIBUTESType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECATTRIBUTESType.java
index 1596c1c..b7b4ad8 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECATTRIBUTESType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECATTRIBUTESType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECATTRIBUTESType1.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECATTRIBUTESType1.java
index e5b41a0..35c0de9 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECATTRIBUTESType1.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECATTRIBUTESType1.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECATTRIBUTESType2.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECATTRIBUTESType2.java
index 7d6a414..887c414 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECATTRIBUTESType2.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECATTRIBUTESType2.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECATTRIBUTESType3.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECATTRIBUTESType3.java
index dff57dc..ae8e59e 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECATTRIBUTESType3.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECATTRIBUTESType3.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECHIERARCHY.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECHIERARCHY.java
index a99b6cb..37ee3a6 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECHIERARCHY.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECHIERARCHY.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECIFICATION.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECIFICATION.java
index 58cd45f..4075473 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECIFICATION.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECIFICATION.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECIFICATIONSType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECIFICATIONSType.java
index 962643b..a769183 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECIFICATIONSType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECIFICATIONSType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECIFICATIONTYPE.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECIFICATIONTYPE.java
index 216e441..80f5942 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECIFICATIONTYPE.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECIFICATIONTYPE.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECIFIEDVALUESType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECIFIEDVALUESType.java
index 023533f..f21eb2b 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECIFIEDVALUESType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECIFIEDVALUESType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECOBJECT.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECOBJECT.java
index db573c6..48be141 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECOBJECT.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECOBJECT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECOBJECTSType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECOBJECTSType.java
index 05043e2..023f0a7 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECOBJECTSType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECOBJECTSType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECOBJECTTYPE.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECOBJECTTYPE.java
index 7fb34d4..aa4a877 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECOBJECTTYPE.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECOBJECTTYPE.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATION.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATION.java
index c8664aa..a20e7ed 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATION.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATION.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATIONGROUPSType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATIONGROUPSType.java
index 8f6ec48..537ddca 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATIONGROUPSType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATIONGROUPSType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATIONSType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATIONSType.java
index 0b788bc..b0771d5 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATIONSType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATIONSType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATIONSType1.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATIONSType1.java
index 08b071c..9b5161c 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATIONSType1.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATIONSType1.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATIONTYPE.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATIONTYPE.java
index b8b8578..013b101 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATIONTYPE.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECRELATIONTYPE.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECTYPESType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECTYPESType.java
index 7ac5c6c..da201bc 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECTYPESType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/SPECTYPESType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TARGETSPECIFICATIONType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TARGETSPECIFICATIONType.java
index 18e00d6..e3a46dc 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TARGETSPECIFICATIONType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TARGETSPECIFICATIONType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TARGETType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TARGETType.java
index 0d7e372..dcfce0c 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TARGETType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TARGETType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/THEHEADERType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/THEHEADERType.java
index 5383d47..1e36e35 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/THEHEADERType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/THEHEADERType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TOOLEXTENSIONSType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TOOLEXTENSIONSType.java
index e3bbb87..bba901b 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TOOLEXTENSIONSType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TOOLEXTENSIONSType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType.java
index 2b2afc3..e8bdb07 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType1.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType1.java
index b0de217..4f67659 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType1.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType1.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType10.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType10.java
index ff00895..7a5d5f0 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType10.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType10.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType2.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType2.java
index a2e8db4..33e0dd7 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType2.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType2.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType3.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType3.java
index 44876b6..0438613 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType3.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType3.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType4.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType4.java
index 1f3dc60..a097e03 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType4.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType4.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType5.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType5.java
index 6ec22f9..85e64d9 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType5.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType5.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType6.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType6.java
index 41e9512..17abbdf 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType6.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType6.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType7.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType7.java
index 47e0905..07017cc 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType7.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType7.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType8.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType8.java
index 00a5021..ae3d1b9 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType8.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType8.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType9.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType9.java
index 7666a27..62c54c1 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType9.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/TYPEType9.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/VALUESType.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/VALUESType.java
index 3f5dec0..60753d1 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/VALUESType.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/VALUESType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/VALUESType1.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/VALUESType1.java
index 873ce5f..3ccc36c 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/VALUESType1.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/VALUESType1.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/VALUESType2.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/VALUESType2.java
index 4907517..d0de1c8 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/VALUESType2.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/VALUESType2.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/VALUESType3.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/VALUESType3.java
index 308e8c8..6fa4575 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/VALUESType3.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/VALUESType3.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDImpl.java
index 3e6cfac..4bf3d19 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType10Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType10Impl.java
index 7bb582c..c8d55fa 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType10Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType10Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType11Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType11Impl.java
index 4e4c6d2..f006f07 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType11Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType11Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType12Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType12Impl.java
index f8286f8..4343bac 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType12Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType12Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType13Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType13Impl.java
index 9549775..7d28436 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType13Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType13Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType14Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType14Impl.java
index e6b86cb..2a4bc6f 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType14Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType14Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType15Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType15Impl.java
index 83eafe3..0b3a0fd 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType15Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType15Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType16Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType16Impl.java
index 8eec171..24c8865 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType16Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType16Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType17Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType17Impl.java
index bbe9bb7..a810e45 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType17Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType17Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType18Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType18Impl.java
index 2358656..aae6445 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType18Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType18Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType19Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType19Impl.java
index 617e11b..ec4317f 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType19Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType19Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType1Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType1Impl.java
index d2f7773..f2eecca 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType1Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType1Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType20Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType20Impl.java
index 978a5ea..9a121d6 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType20Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType20Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType21Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType21Impl.java
index da6f39a..5a60c7f 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType21Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType21Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType22Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType22Impl.java
index ee4ee4a..3d04a7d 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType22Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType22Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType23Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType23Impl.java
index 2f6ae8b..2e2ecaf 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType23Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType23Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType2Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType2Impl.java
index 1505abf..2419e82 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType2Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType2Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType3Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType3Impl.java
index f86d743..729c0a2 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType3Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType3Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType4Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType4Impl.java
index 27b64a5..4a8e4a6 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType4Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType4Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType5Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType5Impl.java
index 39622d0..cd022bf 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType5Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType5Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType6Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType6Impl.java
index 30e622e..4a7d7a9 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType6Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType6Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType7Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType7Impl.java
index 6c1e345..c7f8879 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType7Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType7Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType8Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType8Impl.java
index b03f6be..7a89201 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType8Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType8Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType9Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType9Impl.java
index 0402d6e..1645db5 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType9Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDType9Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDTypeImpl.java
index 194a357..bd06736 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ALTERNATIVEIDTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONBOOLEANImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONBOOLEANImpl.java
index 08f70b0..76330fe 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONBOOLEANImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONBOOLEANImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONDATEImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONDATEImpl.java
index 6bce68e..010decb 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONDATEImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONDATEImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONENUMERATIONImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONENUMERATIONImpl.java
index c53f285..0eb2d27 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONENUMERATIONImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONENUMERATIONImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONINTEGERImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONINTEGERImpl.java
index fe4506b..8d00625 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONINTEGERImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONINTEGERImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONREALImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONREALImpl.java
index a6d7c2d..30a04a2 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONREALImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONREALImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONSTRINGImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONSTRINGImpl.java
index 9cc8bb7..d5832c8 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONSTRINGImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONSTRINGImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONXHTMLImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONXHTMLImpl.java
index d3263d8..6c5ef30 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONXHTMLImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEDEFINITIONXHTMLImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEBOOLEANImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEBOOLEANImpl.java
index a15cbd8..cdb99d8 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEBOOLEANImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEBOOLEANImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEDATEImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEDATEImpl.java
index 6c233b8..96abb39 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEDATEImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEDATEImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEENUMERATIONImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEENUMERATIONImpl.java
index 6ed3772..762fa89 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEENUMERATIONImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEENUMERATIONImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEINTEGERImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEINTEGERImpl.java
index 2978435..63d856b 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEINTEGERImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEINTEGERImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEREALImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEREALImpl.java
index cadcdc9..140c4ac 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEREALImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEREALImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUESTRINGImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUESTRINGImpl.java
index 353579e..3118b2b 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUESTRINGImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUESTRINGImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEXHTMLImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEXHTMLImpl.java
index b8e1a60..8a52387 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEXHTMLImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ATTRIBUTEVALUEXHTMLImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/CHILDRENType1Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/CHILDRENType1Impl.java
index 39efd22..7457177 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/CHILDRENType1Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/CHILDRENType1Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/CHILDRENTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/CHILDRENTypeImpl.java
index 3f2c67d..5a4bdfa 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/CHILDRENTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/CHILDRENTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/CORECONTENTTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/CORECONTENTTypeImpl.java
index 1701741..fe6211f 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/CORECONTENTTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/CORECONTENTTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONBOOLEANImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONBOOLEANImpl.java
index 3393d65..ebb49e6 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONBOOLEANImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONBOOLEANImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONDATEImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONDATEImpl.java
index 56776ce..fe99a67 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONDATEImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONDATEImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONENUMERATIONImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONENUMERATIONImpl.java
index 53b08b4..9630e53 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONENUMERATIONImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONENUMERATIONImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONINTEGERImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONINTEGERImpl.java
index 3ebf591..c3dd808 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONINTEGERImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONINTEGERImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONREALImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONREALImpl.java
index 2689c8a..813f410 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONREALImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONREALImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONSTRINGImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONSTRINGImpl.java
index ec6378b..78c54ef 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONSTRINGImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONSTRINGImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONXHTMLImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONXHTMLImpl.java
index c0c4172..67fc56d 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONXHTMLImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPEDEFINITIONXHTMLImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPESTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPESTypeImpl.java
index c7a7f0e..88e0b7e 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPESTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DATATYPESTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType1Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType1Impl.java
index 5d5bf80..c0f250b 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType1Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType1Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType2Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType2Impl.java
index 0f13aa9..037a4ab 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType2Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType2Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType3Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType3Impl.java
index 1bf3b28..8fc4090 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType3Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType3Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType4Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType4Impl.java
index b2989fb..f110918 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType4Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType4Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType5Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType5Impl.java
index 6f6bd79..48677e5 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType5Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType5Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType6Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType6Impl.java
index ecfa3e0..99d6262 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType6Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUEType6Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUETypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUETypeImpl.java
index 9e71298..85f17cc 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUETypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFAULTVALUETypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType1Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType1Impl.java
index d980afe..c595346 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType1Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType1Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType2Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType2Impl.java
index e6e818f..b8a1861 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType2Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType2Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType3Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType3Impl.java
index 63f386a..fb597dc 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType3Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType3Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType4Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType4Impl.java
index 53f6c45..421eb57 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType4Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType4Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType5Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType5Impl.java
index 21757af..185d714 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType5Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType5Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType6Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType6Impl.java
index 1b26256..dff3c15 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType6Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONType6Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONTypeImpl.java
index 3e41368..6856017 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DEFINITIONTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DocumentRootImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DocumentRootImpl.java
index 978de0d..a8a6d61 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DocumentRootImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/DocumentRootImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/EDITABLEATTSTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/EDITABLEATTSTypeImpl.java
index f040441..83d2aee 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/EDITABLEATTSTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/EDITABLEATTSTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/EMBEDDEDVALUEImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/EMBEDDEDVALUEImpl.java
index e6d848a..e3bf81e 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/EMBEDDEDVALUEImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/EMBEDDEDVALUEImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ENUMVALUEImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ENUMVALUEImpl.java
index f5458c1..1289ba6 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ENUMVALUEImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/ENUMVALUEImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/MyreqifFactoryImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/MyreqifFactoryImpl.java
index 9989a7e..8f27dd5 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/MyreqifFactoryImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/MyreqifFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/MyreqifPackageImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/MyreqifPackageImpl.java
index 19f337a..c2c1a72 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/MyreqifPackageImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/MyreqifPackageImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/OBJECTTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/OBJECTTypeImpl.java
index 0548ff5..2372da4 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/OBJECTTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/OBJECTTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/PROPERTIESTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/PROPERTIESTypeImpl.java
index 5a60b5d..f907ce1 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/PROPERTIESTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/PROPERTIESTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/RELATIONGROUPImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/RELATIONGROUPImpl.java
index b1f27ad..eb1d22c 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/RELATIONGROUPImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/RELATIONGROUPImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/RELATIONGROUPTYPEImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/RELATIONGROUPTYPEImpl.java
index fb75422..6742db0 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/RELATIONGROUPTYPEImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/RELATIONGROUPTYPEImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/REQIFCONTENTImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/REQIFCONTENTImpl.java
index 4163156..3d193f6 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/REQIFCONTENTImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/REQIFCONTENTImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/REQIFHEADERImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/REQIFHEADERImpl.java
index 2916e8d..fc16b53 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/REQIFHEADERImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/REQIFHEADERImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/REQIFImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/REQIFImpl.java
index 9703e8c..32c12e6 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/REQIFImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/REQIFImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/REQIFTOOLEXTENSIONImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/REQIFTOOLEXTENSIONImpl.java
index a750096..764e802 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/REQIFTOOLEXTENSIONImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/REQIFTOOLEXTENSIONImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SOURCESPECIFICATIONTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SOURCESPECIFICATIONTypeImpl.java
index 5d18b86..3aadb80 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SOURCESPECIFICATIONTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SOURCESPECIFICATIONTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SOURCETypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SOURCETypeImpl.java
index e57de2e..d6d06c0 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SOURCETypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SOURCETypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECATTRIBUTESType1Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECATTRIBUTESType1Impl.java
index 1b8e7d8..7455ada 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECATTRIBUTESType1Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECATTRIBUTESType1Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECATTRIBUTESType2Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECATTRIBUTESType2Impl.java
index 64b203f..d4eb469 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECATTRIBUTESType2Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECATTRIBUTESType2Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECATTRIBUTESType3Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECATTRIBUTESType3Impl.java
index 008a334..c9dc7bc 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECATTRIBUTESType3Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECATTRIBUTESType3Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECATTRIBUTESTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECATTRIBUTESTypeImpl.java
index 3b08cec..5108e30 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECATTRIBUTESTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECATTRIBUTESTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECHIERARCHYImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECHIERARCHYImpl.java
index 7cdddb6..6482cd4 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECHIERARCHYImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECHIERARCHYImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECIFICATIONImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECIFICATIONImpl.java
index b6a387c..41ab44e 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECIFICATIONImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECIFICATIONImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECIFICATIONSTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECIFICATIONSTypeImpl.java
index c29d233..8a6078c 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECIFICATIONSTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECIFICATIONSTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECIFICATIONTYPEImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECIFICATIONTYPEImpl.java
index c680fa4..75356b9 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECIFICATIONTYPEImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECIFICATIONTYPEImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECIFIEDVALUESTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECIFIEDVALUESTypeImpl.java
index 629748f..0de150c 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECIFIEDVALUESTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECIFIEDVALUESTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECOBJECTImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECOBJECTImpl.java
index ea261e4..6dc7525 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECOBJECTImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECOBJECTImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECOBJECTSTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECOBJECTSTypeImpl.java
index 3b8ed86..1914040 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECOBJECTSTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECOBJECTSTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECOBJECTTYPEImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECOBJECTTYPEImpl.java
index 706ff1b..c5ee087 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECOBJECTTYPEImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECOBJECTTYPEImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONGROUPSTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONGROUPSTypeImpl.java
index a4336ae..45057ca 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONGROUPSTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONGROUPSTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONImpl.java
index 7d20b26..20830d3 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONSType1Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONSType1Impl.java
index 5705607..3a4ccca 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONSType1Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONSType1Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONSTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONSTypeImpl.java
index 4727a87..08e0f18 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONSTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONSTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONTYPEImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONTYPEImpl.java
index fb96f3b..a6601b4 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONTYPEImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECRELATIONTYPEImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECTYPESTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECTYPESTypeImpl.java
index 16528a2..779a977 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECTYPESTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/SPECTYPESTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TARGETSPECIFICATIONTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TARGETSPECIFICATIONTypeImpl.java
index 888a61f..28bda00 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TARGETSPECIFICATIONTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TARGETSPECIFICATIONTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TARGETTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TARGETTypeImpl.java
index 3df8017..a9c9a5c 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TARGETTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TARGETTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/THEHEADERTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/THEHEADERTypeImpl.java
index 664d4b9..550f4aa 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/THEHEADERTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/THEHEADERTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TOOLEXTENSIONSTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TOOLEXTENSIONSTypeImpl.java
index 27579df..2e3eeea 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TOOLEXTENSIONSTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TOOLEXTENSIONSTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType10Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType10Impl.java
index 64fe0d6..928114d 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType10Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType10Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType1Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType1Impl.java
index fdaa730..993e9f9 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType1Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType1Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType2Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType2Impl.java
index 354ea13..8bae0ea 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType2Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType2Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType3Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType3Impl.java
index d69840b..ab81571 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType3Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType3Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType4Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType4Impl.java
index 7c22ea9..58cf92b 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType4Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType4Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType5Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType5Impl.java
index c80596f..f487ba8 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType5Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType5Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType6Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType6Impl.java
index 7fce6fe..8f278a6 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType6Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType6Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType7Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType7Impl.java
index 759f654..c77dbdf 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType7Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType7Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType8Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType8Impl.java
index 6d30833..284b6e7 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType8Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType8Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType9Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType9Impl.java
index 6b749de..9bcb9e6 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType9Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPEType9Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPETypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPETypeImpl.java
index 6d5715c..ed5305b 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPETypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/TYPETypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/VALUESType1Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/VALUESType1Impl.java
index 0096776..44309b8 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/VALUESType1Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/VALUESType1Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/VALUESType2Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/VALUESType2Impl.java
index 2bce8f7..432cc7e 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/VALUESType2Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/VALUESType2Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/VALUESType3Impl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/VALUESType3Impl.java
index 5391d0b..df7718f 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/VALUESType3Impl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/VALUESType3Impl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/VALUESTypeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/VALUESTypeImpl.java
index 56d33fe..29bd76a 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/VALUESTypeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/impl/VALUESTypeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifAdapterFactory.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifAdapterFactory.java
index 8b40ac1..20f44a4 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifAdapterFactory.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifAdapterFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifResourceFactoryImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifResourceFactoryImpl.java
index 2a40b1d..6d92120 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifResourceFactoryImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifResourceImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifResourceImpl.java
index d057c1c..f12f5cd 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifResourceImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifResourceImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifSwitch.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifSwitch.java
index 2d16322..c449f0c 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifSwitch.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifSwitch.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifXMLProcessor.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifXMLProcessor.java
index cf11527..6b6e375 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifXMLProcessor.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/env/emf/myreqif/util/MyreqifXMLProcessor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/ExtNodesFactory.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/ExtNodesFactory.java
index ad3554d..e99a7e4 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/ExtNodesFactory.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/ExtNodesFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/ExtNodesPackage.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/ExtNodesPackage.java
index f20a1b5..d3fe3f2 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/ExtNodesPackage.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/ExtNodesPackage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/ExtendedNode.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/ExtendedNode.java
index d623435..edc5aa0 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/ExtendedNode.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/ExtendedNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/Extension.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/Extension.java
index 25c2134..ede4174 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/Extension.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/Extension.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/impl/ExtNodesFactoryImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/impl/ExtNodesFactoryImpl.java
index f84075b..21f4183 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/impl/ExtNodesFactoryImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/impl/ExtNodesFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/impl/ExtNodesPackageImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/impl/ExtNodesPackageImpl.java
index 7008764..d0c8fe8 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/impl/ExtNodesPackageImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/impl/ExtNodesPackageImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/impl/ExtendedNodeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/impl/ExtendedNodeImpl.java
index 8af7deb..1a461dd 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/impl/ExtendedNodeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/impl/ExtendedNodeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/impl/ExtensionImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/impl/ExtensionImpl.java
index 41068e6..f534641 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/impl/ExtensionImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/impl/ExtensionImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesAdapterFactory.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesAdapterFactory.java
index e65e4e5..5cee167 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesAdapterFactory.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesAdapterFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesResourceFactoryImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesResourceFactoryImpl.java
index 3b68231..e325ca0 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesResourceFactoryImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesResourceImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesResourceImpl.java
index 269d376..42d34cf 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesResourceImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesResourceImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesSwitch.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesSwitch.java
index bd7b55b..686a329 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesSwitch.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesSwitch.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesXMLProcessor.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesXMLProcessor.java
index 03c4346..7d7fb14 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesXMLProcessor.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/extnodes/util/ExtNodesXMLProcessor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/AbstractNode.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/AbstractNode.java
index dcf65e2..b33170f 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/AbstractNode.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/AbstractNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/Node.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/Node.java
index e215270..6dd681d 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/Node.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/Node.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/NodesFactory.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/NodesFactory.java
index 24bfb80..6458274 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/NodesFactory.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/NodesFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/NodesPackage.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/NodesPackage.java
index b3a2eff..1e16937 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/NodesPackage.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/NodesPackage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/SubNode.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/SubNode.java
index d41ae91..122568c 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/SubNode.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/SubNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/AbstractNodeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/AbstractNodeImpl.java
index 8301590..cdb83ce 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/AbstractNodeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/AbstractNodeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/NodeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/NodeImpl.java
index ca0e963..5c3cbe2 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/NodeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/NodeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/NodesFactoryImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/NodesFactoryImpl.java
index 46b7306..6bac67a 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/NodesFactoryImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/NodesFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/NodesPackageImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/NodesPackageImpl.java
index 34509a6..722bd00 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/NodesPackageImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/NodesPackageImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/SubNodeImpl.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/SubNodeImpl.java
index 69c7596..6a40ff2 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/SubNodeImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/impl/SubNodeImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/util/NodesAdapterFactory.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/util/NodesAdapterFactory.java
index 08213e5..e92c3f0 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/util/NodesAdapterFactory.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/util/NodesAdapterFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/util/NodesSwitch.java b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/util/NodesSwitch.java
index 33bc49d..7d55bec 100644
--- a/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/util/NodesSwitch.java
+++ b/org.eclipse.rmf.tests.serialization/src-gen/org/eclipse/rmf/tests/serialization/model/nodes/util/NodesSwitch.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/adapter/IDAdapterTests.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/adapter/IDAdapterTests.java
index 50fa53e..3632d54 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/adapter/IDAdapterTests.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/adapter/IDAdapterTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/AbstractEMFTestCase.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/AbstractEMFTestCase.java
index 293ccf6..3330bc4 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/AbstractEMFTestCase.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/AbstractEMFTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/EMFDeserializationTests.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/EMFDeserializationTests.java
index 4148986..c78b182 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/EMFDeserializationTests.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/EMFDeserializationTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -70,6 +70,9 @@
 	@Before
 	public void setUp() {
 		EPackage.Registry.INSTANCE.clear();
+		EPackage.Registry.INSTANCE.put(XMLTypePackage.eNS_URI, XMLTypePackage.eINSTANCE);
+		EPackage.Registry.INSTANCE.put(XMLNamespacePackage.eNS_URI, XMLNamespacePackage.eINSTANCE);
+
 	}
 
 	@AfterClass
@@ -90,8 +93,6 @@
 
 		// prepare resource set
 		ResourceSet resourceSet = new ResourceSetImpl();
-		EPackage.Registry.INSTANCE.put(XMLTypePackage.eNS_URI, XMLTypePackage.eINSTANCE);
-		EPackage.Registry.INSTANCE.put(XMLNamespacePackage.eNS_URI, XMLNamespacePackage.eINSTANCE);
 		resourceSet.getPackageRegistry().put(MyreqifPackage.eNS_URI, MyreqifPackage.eINSTANCE);
 		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("xml", new MyreqifResourceFactoryImpl());
 
@@ -114,8 +115,6 @@
 
 		// prepare resource set
 		ResourceSet resourceSet = new ResourceSetImpl();
-		EPackage.Registry.INSTANCE.put(XMLTypePackage.eNS_URI, XMLTypePackage.eINSTANCE);
-		EPackage.Registry.INSTANCE.put(XMLNamespacePackage.eNS_URI, XMLNamespacePackage.eINSTANCE);
 		resourceSet.getPackageRegistry().put(MyreqifPackage.eNS_URI, MyreqifPackage.eINSTANCE);
 		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("xml", new MyreqifResourceFactoryImpl());
 
@@ -139,8 +138,6 @@
 
 		// prepare resource set
 		ResourceSet resourceSet = new ResourceSetImpl();
-		EPackage.Registry.INSTANCE.put(XMLTypePackage.eNS_URI, XMLTypePackage.eINSTANCE);
-		EPackage.Registry.INSTANCE.put(XMLNamespacePackage.eNS_URI, XMLNamespacePackage.eINSTANCE);
 		resourceSet.getPackageRegistry().put(MyreqifPackage.eNS_URI, MyreqifPackage.eINSTANCE);
 		resourceSet.getPackageRegistry().put(EcorePackage.eNS_URI, EcorePackage.eINSTANCE);
 		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("xml", new MyreqifResourceFactoryImpl());
@@ -166,8 +163,6 @@
 
 		// prepare resource set
 		ResourceSet resourceSet = new ResourceSetImpl();
-		EPackage.Registry.INSTANCE.put(XMLTypePackage.eNS_URI, XMLTypePackage.eINSTANCE);
-		EPackage.Registry.INSTANCE.put(XMLNamespacePackage.eNS_URI, XMLNamespacePackage.eINSTANCE);
 		resourceSet.getPackageRegistry().put(MyreqifPackage.eNS_URI, MyreqifPackage.eINSTANCE);
 		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("xml", new MyreqifResourceFactoryImpl()); //$NON-NLS-1$
 
@@ -200,8 +195,6 @@
 		// since the ecore is created from schema we have to register XMLTypeType and XMLNamespacePackage in the
 		// global package registry. It is important to register XMLTypePackage since XMLNamespacePackage requires it for
 		// initialization and searches the global registry only
-		EPackage.Registry.INSTANCE.put(XMLTypePackage.eNS_URI, XMLTypePackage.eINSTANCE);
-		EPackage.Registry.INSTANCE.put(XMLNamespacePackage.eNS_URI, XMLNamespacePackage.eINSTANCE);
 		resourceSet.getPackageRegistry().put(EcorePackage.eNS_URI, EcorePackage.eINSTANCE);
 		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("ecore", new EcoreResourceFactoryImpl()); //$NON-NLS-1$
 		Resource ecoreResource = resourceSet.createResource(URI.createURI(MODEL_BASEDIR + "myreqif.ecore", true)); //$NON-NLS-1$
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/EMFDeserializationWithSchemaValidationTests.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/EMFDeserializationWithSchemaValidationTests.java
index b368443..9d229e2 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/EMFDeserializationWithSchemaValidationTests.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/EMFDeserializationWithSchemaValidationTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/EMFRoundtripTests.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/EMFRoundtripTests.java
index 76290de..e3b179f 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/EMFRoundtripTests.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/EMFRoundtripTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/EMFSerializationTests.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/EMFSerializationTests.java
index 1adc471..6b98ace 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/EMFSerializationTests.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/emf/EMFSerializationTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/sphinx/SphinxDeserializationTests.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/sphinx/SphinxDeserializationTests.java
index c7cc509..99a14bc 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/sphinx/SphinxDeserializationTests.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/sphinx/SphinxDeserializationTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/xerces/XercesSchemaValidationTests.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/xerces/XercesSchemaValidationTests.java
index 0fd8d3f..f6430af 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/xerces/XercesSchemaValidationTests.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/env/xerces/XercesSchemaValidationTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/load/BasicLoadTests.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/load/BasicLoadTests.java
index d1b1c46..0b77b17 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/load/BasicLoadTests.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/load/BasicLoadTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/load/FoereignNamespaceLoadTests.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/load/FoereignNamespaceLoadTests.java
index bc7b3c9..4c56d7a 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/load/FoereignNamespaceLoadTests.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/load/FoereignNamespaceLoadTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/metadata/XMLPersistenceExtendedMetaDataTests.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/metadata/XMLPersistenceExtendedMetaDataTests.java
index 8a3fca6..a3fa2ff 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/metadata/XMLPersistenceExtendedMetaDataTests.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/metadata/XMLPersistenceExtendedMetaDataTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/model/nodes/serialization/NodesResourceFactoryImpl.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/model/nodes/serialization/NodesResourceFactoryImpl.java
index deeee6c..41f8a65 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/model/nodes/serialization/NodesResourceFactoryImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/model/nodes/serialization/NodesResourceFactoryImpl.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.serialization.model.nodes.serialization;
 
 import org.eclipse.emf.common.util.URI;
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/model/nodes/serialization/NodesResourceImpl.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/model/nodes/serialization/NodesResourceImpl.java
index 36f8459..b724077 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/model/nodes/serialization/NodesResourceImpl.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/model/nodes/serialization/NodesResourceImpl.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.serialization.model.nodes.serialization;
 
 import java.util.Collection;
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/monitor/ProgressMonitorTests.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/monitor/ProgressMonitorTests.java
index 61dc629..9569d84 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/monitor/ProgressMonitorTests.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/monitor/ProgressMonitorTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/robustness/LoadPatternAttribute0100RobustnessTests.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/robustness/LoadPatternAttribute0100RobustnessTests.java
index cbfdafb..7a56c28 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/robustness/LoadPatternAttribute0100RobustnessTests.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/robustness/LoadPatternAttribute0100RobustnessTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/AbstractSaveTestCase.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/AbstractSaveTestCase.java
index f210dd1..d66415a 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/AbstractSaveTestCase.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/AbstractSaveTestCase.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.serialization.save;
 
 import static org.junit.Assert.assertEquals;
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/BasicSaveTests.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/BasicSaveTests.java
index 6f33d13..e703a05 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/BasicSaveTests.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/BasicSaveTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/CustomNamespacePrefixSaveTests.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/CustomNamespacePrefixSaveTests.java
index 474545a..5df9a32 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/CustomNamespacePrefixSaveTests.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/CustomNamespacePrefixSaveTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.serialization.save;
 
 import static org.junit.Assert.assertEquals;
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/EIsSetEReferenceContainedSaveTests.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/EIsSetEReferenceContainedSaveTests.java
index e703a9b..be06af8 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/EIsSetEReferenceContainedSaveTests.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/EIsSetEReferenceContainedSaveTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.serialization.save;
 
 import static org.junit.Assert.assertSame;
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/ForeignNameSpaceContainedSaveTests.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/ForeignNameSpaceContainedSaveTests.java
index dfb5d0a..c5bb235 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/ForeignNameSpaceContainedSaveTests.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/save/ForeignNameSpaceContainedSaveTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2014 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mark Broerkens (itemis AG) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.rmf.tests.serialization.save;
 
 import static org.junit.Assert.assertEquals;
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/util/AbstractTestCase.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/util/AbstractTestCase.java
index 0328407..abead8c 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/util/AbstractTestCase.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/util/AbstractTestCase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/util/LoadSaveUtil.java b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/util/LoadSaveUtil.java
index e2ee97a..15c4979 100644
--- a/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/util/LoadSaveUtil.java
+++ b/org.eclipse.rmf.tests.serialization/src/org/eclipse/rmf/tests/serialization/util/LoadSaveUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 itemis AG.
+ * Copyright (c) 2013 itemis AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at